From: Cheng Zhao <zcbenz@gmail.com>
Date: Sun, 29 Sep 2013 13:43:17 +0000 (+0800)
Subject: Set proxy service at the right place.
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=709563c09047924b79d714402b86ab8cf772bc5e;p=platform%2Fframework%2Fweb%2Fcrosswalk-tizen.git

Set proxy service at the right place.
---

diff --git a/browser/net/atom_url_request_context_getter.cc b/browser/net/atom_url_request_context_getter.cc
index 92a3d9e..e7252b7 100644
--- a/browser/net/atom_url_request_context_getter.cc
+++ b/browser/net/atom_url_request_context_getter.cc
@@ -84,8 +84,17 @@ net::URLRequestContext* AtomURLRequestContextGetter::GetURLRequestContext() {
 
     scoped_ptr<net::HostResolver> host_resolver(
         net::HostResolver::CreateDefaultResolver(NULL));
+    net::DhcpProxyScriptFetcherFactory dhcp_factory;
 
     storage_->set_cert_verifier(net::CertVerifier::CreateDefault());
+    storage_->set_proxy_service(
+        net::CreateProxyServiceUsingV8ProxyResolver(
+            proxy_config_service_.release(),
+            new net::ProxyScriptFetcherImpl(url_request_context_.get()),
+            dhcp_factory.Create(url_request_context_.get()),
+            host_resolver.get(),
+            NULL,
+            url_request_context_->network_delegate()));
     storage_->set_ssl_config_service(new net::SSLConfigServiceDefaults);
     storage_->set_http_auth_handler_factory(
         net::HttpAuthHandlerFactory::CreateDefault(host_resolver.get()));
@@ -122,16 +131,6 @@ net::URLRequestContext* AtomURLRequestContextGetter::GetURLRequestContext() {
     network_session_params.host_resolver =
         url_request_context_->host_resolver();
 
-    net::DhcpProxyScriptFetcherFactory dhcp_factory;
-    storage_->set_proxy_service(
-        net::CreateProxyServiceUsingV8ProxyResolver(
-            proxy_config_service_.release(),
-            new net::ProxyScriptFetcherImpl(url_request_context_.get()),
-            dhcp_factory.Create(url_request_context_.get()),
-            url_request_context_->host_resolver(),
-            NULL,
-            url_request_context_->network_delegate()));
-
     net::HttpCache* main_cache = new net::HttpCache(
         network_session_params, main_backend);
     storage_->set_http_transaction_factory(main_cache);