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

Commit 63d79476 authored by Kristian Monsen's avatar Kristian Monsen
Browse files

Merge Chromium at r11.0.696.0: Using setter instead of direct variable access 

Members in UrlRequestContext was made private in upstream CL:
http://src.chromium.org/viewvc/chrome/trunk/src/net/url_request/url_request_context.h?view=diff&pathrev=77261&r1=75164&r2=75165

Change-Id: I412ddf36b0818e59b9b3ae428407d562facd4785
parent 95068be1

media/libstagefright/chromium_http/support.cpp

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


    mUserAgent = ua.c_str();



    net_log_ = new SfNetLog;

    set_net_log(new SfNetLog());



    host_resolver_ =

    set_host_resolver(

        net::CreateSystemHostResolver(

                net::HostResolver::kDefaultParallelism,

                NULL /* resolver_proc */,

                net_log_);

                net_log()));



    ssl_config_service_ =

        net::SSLConfigService::CreateSystemSSLConfigService();

    set_ssl_config_service(

        net::SSLConfigService::CreateSystemSSLConfigService());



    proxy_service_ = net::ProxyService::CreateWithoutProxyResolver(

            new net::ProxyConfigServiceAndroid, net_log_);

    set_proxy_service(net::ProxyService::CreateWithoutProxyResolver(

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



    http_transaction_factory_ = new net::HttpCache(

            host_resolver_,

    set_http_transaction_factory(new net::HttpCache(

            host_resolver(),

            new net::CertVerifier(),

            dnsrr_resolver_,

            dns_cert_checker_.get(),

            proxy_service_.get(),

            ssl_config_service_.get(),

            net::HttpAuthHandlerFactory::CreateDefault(host_resolver_),

            network_delegate_,

            net_log_,

            NULL);  // backend_factory

            dnsrr_resolver(),

            dns_cert_checker(),

            proxy_service(),

            ssl_config_service(),

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

            network_delegate(),

            net_log(),

            NULL));  // backend_factory

}



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