Chromecast: initial checkin of Android-based cast shell.

chromecast/shell/browser/url_request_context_factory.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chromecast/shell/browser/url_request_context_factory.h"
 
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/macros.h"
 #include "base/path_service.h"
@@ skipping 45 matching lines @@
       : is_media_(is_media),
         factory_(factory) {
   }
 
   virtual net::URLRequestContext* GetURLRequestContext() OVERRIDE {
     if (!request_context_) {
       if (is_media_) {
         request_context_.reset(factory_->CreateMediaRequestContext());
       } else {
         request_context_.reset(factory_->CreateSystemRequestContext());
+#if defined(USE_NSS)
         // Set request context used by NSS for Crl requests.
         net::SetURLRequestContextForNSSHttpIO(request_context_.get());
+#endif  // defined(USE_NSS)
       }
     }
     return request_context_.get();
   }
 
   virtual scoped_refptr<base::SingleThreadTaskRunner>
       GetNetworkTaskRunner() const OVERRIDE {
     return content::BrowserThread::GetMessageLoopProxyForThread(
         content::BrowserThread::IO);
   }
@@ skipping 59 matching lines @@
 
 URLRequestContextFactory::~URLRequestContextFactory() {
 }
 
 void URLRequestContextFactory::InitializeOnUIThread() {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
   // Cast http user agent settings must be initialized in UI thread
   // because it registers itself to pref notification observer which is not
   // thread safe.
   http_user_agent_settings_.reset(new CastHttpUserAgentSettings());
+
+  // Proxy config service should be initialized in UI thread, since
+  // ProxyConfigServiceDelegate on Android expects UI thread.
+  proxy_config_service_.reset(net::ProxyService::CreateSystemProxyConfigService(
+      content::BrowserThread::GetMessageLoopProxyForThread(
+          content::BrowserThread::IO).get(),
+      content::BrowserThread::UnsafeGetMessageLoopForThread(
+          content::BrowserThread::FILE)));
 }
 
 net::URLRequestContextGetter* URLRequestContextFactory::CreateMainGetter(
     content::BrowserContext* browser_context,
     content::ProtocolHandlerMap* protocol_handlers,
     content::URLRequestInterceptorScopedVector request_interceptors) {
   DCHECK(!main_getter_) << "Main URLRequestContextGetter already initialized";
   main_getter_ = new MainURLRequestContextGetter(this,
                                                  browser_context,
                                                  protocol_handlers,
@@ skipping 37 matching lines @@
 
   ssl_config_service_ = new net::SSLConfigServiceDefaults;
 
   transport_security_state_.reset(new net::TransportSecurityState());
   http_auth_handler_factory_.reset(
       net::HttpAuthHandlerFactory::CreateDefault(host_resolver_.get()));
 
   http_server_properties_.reset(new net::HttpServerPropertiesImpl);
 
   proxy_service_.reset(net::ProxyService::CreateUsingSystemProxyResolver(
-      net::ProxyService::CreateSystemProxyConfigService(
-          content::BrowserThread::GetMessageLoopProxyForThread(
-              content::BrowserThread::IO).get(),
-          content::BrowserThread::UnsafeGetMessageLoopForThread(
-              content::BrowserThread::FILE)),
-      0,
-      NULL));
+      proxy_config_service_.release(), 0, NULL));
   system_dependencies_initialized_ = true;
 }
 
 void URLRequestContextFactory::InitializeMainContextDependencies(
     net::HttpTransactionFactory* transaction_factory,
     content::ProtocolHandlerMap* protocol_handlers,
     content::URLRequestInterceptorScopedVector request_interceptors) {
   if (main_dependencies_initialized_)
     return;
 
@@ skipping 156 matching lines @@
       http_user_agent_settings_.get());
 
   main_context->set_http_transaction_factory(
       main_transaction_factory_.get());
   main_context->set_job_factory(main_job_factory_.get());
   return main_context;
 }
 
 }  // namespace shell
 }  // namespace chromecast