Switch to using URLRequestContextBuilder to create some URLRequestContexts.

remoting/base/url_request_context.cc

Index: remoting/base/url_request_context.cc
diff --git a/remoting/base/url_request_context.cc b/remoting/base/url_request_context.cc
deleted file mode 100644
index 39985ab4a23080dbebf07038569b89df32459ae0..0000000000000000000000000000000000000000
--- a/remoting/base/url_request_context.cc
+++ /dev/null
@@ -1,143 +0,0 @@
-// Copyright 2013 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 "remoting/base/url_request_context.h"
-
-#include "base/message_loop/message_loop_proxy.h"
-#include "net/cert/cert_verifier.h"
-#include "net/dns/host_resolver.h"
-#include "net/http/http_auth_handler_factory.h"
-#include "net/http/http_network_layer.h"
-#include "net/http/http_network_session.h"
-#include "net/http/http_server_properties_impl.h"
-#include "net/http/transport_security_state.h"
-#include "net/proxy/proxy_config_service.h"
-#include "net/proxy/proxy_service.h"
-#include "net/ssl/ssl_config_service_defaults.h"
-#include "net/url_request/url_request_job_factory_impl.h"
-#include "remoting/base/vlog_net_log.h"
-
-#if defined(OS_WIN)
-#include "net/proxy/proxy_config_service_win.h"
-#elif defined(OS_IOS)
-#include "net/proxy/proxy_config_service_ios.h"
-#elif defined(OS_MACOSX)
-#include "net/proxy/proxy_config_service_mac.h"
-#elif defined(OS_LINUX) && !defined(OS_CHROMEOS)
-#include "net/proxy/proxy_config_service_linux.h"
-#endif
-
-namespace remoting {
-
-namespace {
-
-// Config getter that always returns direct settings.
-class ProxyConfigServiceDirect : public net::ProxyConfigService {
- public:
-  // ProxyConfigService implementation:
-  virtual void AddObserver(Observer* observer) OVERRIDE {}
-  virtual void RemoveObserver(Observer* observer) OVERRIDE {}
-  virtual ConfigAvailability GetLatestProxyConfig(
-      net::ProxyConfig* config) OVERRIDE {
-    *config = net::ProxyConfig::CreateDirect();
-    return CONFIG_VALID;
-  }
-};
-
-net::ProxyConfigService* CreateSystemProxyConfigService(
-    base::SingleThreadTaskRunner* io_thread_task_runner) {
-#if defined(OS_WIN)
-  return new net::ProxyConfigServiceWin();
-#elif defined(OS_IOS)
-    return new net::ProxyConfigServiceIOS();
-#elif defined(OS_MACOSX)
-  return new net::ProxyConfigServiceMac(io_thread_task_runner);
-#elif defined(OS_CHROMEOS)
-  NOTREACHED() << "ChromeOS is not a supported target for Chromoting host";
-  return NULL;
-#elif defined(OS_LINUX)
-  // TODO(sergeyu): Currently ProxyConfigServiceLinux depends on
-  // base::OneShotTimer that doesn't work properly on main NPAPI
-  // thread. Fix that and uncomment the code below.
-  //
-  // net::ProxyConfigServiceLinux* linux_config_service =
-  //     new net::ProxyConfigServiceLinux();
-  // linux_config_service->SetupAndFetchInitialConfig(
-  //     ui_message_loop_, io_message_loop->message_loop_proxy(),
-  //     file_message_loop);
-
-  // return linux_config_service;
-  return new ProxyConfigServiceDirect();
-#else
-  LOG(WARNING) << "Failed to choose a system proxy settings fetcher "
-                  "for this platform.";
-  return new ProxyConfigServiceDirect();
-#endif
-}
-
-}  // namespace
-
-// TODO(willchan): This is largely copied from service_url_request_context.cc,
-// which is in turn copied from some test code. Move it somewhere reusable.
-URLRequestContext::URLRequestContext(
-    scoped_ptr<net::ProxyConfigService> proxy_config_service)
-    : storage_(this) {
-  scoped_ptr<VlogNetLog> net_log(new VlogNetLog());
-  storage_.set_host_resolver(
-      net::HostResolver::CreateDefaultResolver(net_log.get()));
-  storage_.set_proxy_service(net::ProxyService::CreateUsingSystemProxyResolver(
-      proxy_config_service.release(), 0u, net_log.get()));
-  storage_.set_cert_verifier(net::CertVerifier::CreateDefault());
-  storage_.set_ssl_config_service(new net::SSLConfigServiceDefaults);
-  storage_.set_http_auth_handler_factory(
-      net::HttpAuthHandlerFactory::CreateDefault(host_resolver()));
-  storage_.set_http_server_properties(
-      scoped_ptr<net::HttpServerProperties>(
-          new net::HttpServerPropertiesImpl()));
-  storage_.set_transport_security_state(new net::TransportSecurityState);
-  storage_.set_job_factory(new net::URLRequestJobFactoryImpl());
-
-  net::HttpNetworkSession::Params session_params;
-  session_params.host_resolver = host_resolver();
-  session_params.cert_verifier = cert_verifier();
-  session_params.transport_security_state = transport_security_state();
-  session_params.proxy_service = proxy_service();
-  session_params.ssl_config_service = ssl_config_service();
-  session_params.http_auth_handler_factory = http_auth_handler_factory();
-  session_params.http_server_properties = http_server_properties();
-  session_params.net_log = net_log.get();
-  scoped_refptr<net::HttpNetworkSession> network_session(
-      new net::HttpNetworkSession(session_params));
-  storage_.set_http_transaction_factory(
-      new net::HttpNetworkLayer(network_session.get()));
-  storage_.set_net_log(net_log.release());
-}
-
-URLRequestContext::~URLRequestContext() {
-}
-
-URLRequestContextGetter::URLRequestContextGetter(
-    scoped_refptr<base::SingleThreadTaskRunner> network_task_runner)
-    : network_task_runner_(network_task_runner) {
-  proxy_config_service_.reset(CreateSystemProxyConfigService(
-      network_task_runner_.get()));
-}
-
-net::URLRequestContext* URLRequestContextGetter::GetURLRequestContext() {
-  if (!url_request_context_.get()) {
-    url_request_context_.reset(
-        new URLRequestContext(proxy_config_service_.Pass()));
-  }
-  return url_request_context_.get();
-}
-
-scoped_refptr<base::SingleThreadTaskRunner>
-URLRequestContextGetter::GetNetworkTaskRunner() const {
-  return network_task_runner_;
-}
-
-URLRequestContextGetter::~URLRequestContextGetter() {
-}
-
-}  // namespace remoting