Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cebcdaef authored by Kristian Monsen's avatar Kristian Monsen Committed by Android (Google) Code Review
Browse files

Merge changes I7e8401a4,I412ddf36 

* changes:
  Merge Chromium at r11.0.696.0: New autofill strings
  Merge Chromium at r11.0.696.0: Using setter instead of direct variable access
parents 0f30bd90 63d79476

media/libstagefright/chromium_http/support.cpp

+17 −17
Original line number Original line Diff line number Diff line
@@ -115,31 +115,31 @@ SfRequestContext::SfRequestContext() { 




    mUserAgent = ua.c_str();

    mUserAgent = ua.c_str();





    net_log_ = new SfNetLog;

    set_net_log(new SfNetLog());





    host_resolver_ =

    set_host_resolver(

        net::CreateSystemHostResolver(

        net::CreateSystemHostResolver(

                net::HostResolver::kDefaultParallelism,

                net::HostResolver::kDefaultParallelism,

                NULL /* resolver_proc */,

                NULL /* resolver_proc */,

                net_log_);

                net_log()));





    ssl_config_service_ =

    set_ssl_config_service(

        net::SSLConfigService::CreateSystemSSLConfigService();

        net::SSLConfigService::CreateSystemSSLConfigService());





    proxy_service_ = net::ProxyService::CreateWithoutProxyResolver(

    set_proxy_service(net::ProxyService::CreateWithoutProxyResolver(

            new net::ProxyConfigServiceAndroid, net_log_);

        new net::ProxyConfigServiceAndroid, net_log()));





    http_transaction_factory_ = new net::HttpCache(

    set_http_transaction_factory(new net::HttpCache(

            host_resolver_,

            host_resolver(),

            new net::CertVerifier(),

            new net::CertVerifier(),

            dnsrr_resolver_,

            dnsrr_resolver(),

            dns_cert_checker_.get(),

            dns_cert_checker(),

            proxy_service_.get(),

            proxy_service(),

            ssl_config_service_.get(),

            ssl_config_service(),

            net::HttpAuthHandlerFactory::CreateDefault(host_resolver_),

            net::HttpAuthHandlerFactory::CreateDefault(host_resolver()),

            network_delegate_,

            network_delegate(),

            net_log_,

            net_log(),

            NULL);  // backend_factory

            NULL));  // backend_factory

}

}





const std::string &SfRequestContext::GetUserAgent(const GURL &url) const {

const std::string &SfRequestContext::GetUserAgent(const GURL &url) const {