Index: chromecast/browser/url_request_context_factory.cc |
diff --git a/chromecast/browser/url_request_context_factory.cc b/chromecast/browser/url_request_context_factory.cc |
index 0a250b20a1ab55417b63256e249212bd0eec8bfc..6e00d92723f2ee1189b1afa2581de617050642f3 100644 |
--- a/chromecast/browser/url_request_context_factory.cc |
+++ b/chromecast/browser/url_request_context_factory.cc |
@@ -4,6 +4,7 @@ |
#include "chromecast/browser/url_request_context_factory.h" |
+#include <algorithm> |
#include <utility> |
#include "base/command_line.h" |
@@ -12,6 +13,7 @@ |
#include "base/memory/ptr_util.h" |
#include "base/threading/worker_pool.h" |
#include "chromecast/base/chromecast_switches.h" |
+#include "chromecast/browser/cast_browser_process.h" |
#include "chromecast/browser/cast_http_user_agent_settings.h" |
#include "chromecast/browser/cast_network_delegate.h" |
#include "content/public/browser/browser_context.h" |
@@ -30,6 +32,7 @@ |
#include "net/http/http_network_layer.h" |
#include "net/http/http_server_properties_impl.h" |
#include "net/http/http_stream_factory.h" |
+#include "net/proxy/proxy_config_service_fixed.h" |
#include "net/proxy/proxy_service.h" |
#include "net/ssl/channel_id_service.h" |
#include "net/ssl/default_channel_id_store.h" |
@@ -180,12 +183,8 @@ void URLRequestContextFactory::InitializeOnUIThread(net::NetLog* net_log) { |
// Proxy config service should be initialized in UI thread, since |
// ProxyConfigServiceDelegate on Android expects UI thread. |
- proxy_config_service_ = net::ProxyService::CreateSystemProxyConfigService( |
- content::BrowserThread::GetTaskRunnerForThread( |
- content::BrowserThread::IO), |
- content::BrowserThread::GetTaskRunnerForThread( |
- content::BrowserThread::FILE)); |
- |
+ proxy_config_service_ = base::MakeUnique<net::ProxyConfigServiceFixed>( |
+ *CastBrowserProcess::GetInstance()->proxy_config()); |
net_log_ = net_log; |
} |