Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3769)

Unified Diff: chrome/browser/net/proxy_service_factory.cc

Issue 227233006: Make net use v8 through gin (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: updates Created 6 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/io_thread.cc ('k') | gin/isolate_holder.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/net/proxy_service_factory.cc
diff --git a/chrome/browser/net/proxy_service_factory.cc b/chrome/browser/net/proxy_service_factory.cc
index d3a434d20795504fee9edeb72804e24a5947693d..5933f4affae529b3504a9659ecc48bb38e031f07 100644
--- a/chrome/browser/net/proxy_service_factory.cc
+++ b/chrome/browser/net/proxy_service_factory.cc
@@ -30,6 +30,10 @@
#include "win8/util/win8_util.h"
#endif
+#if !defined(OS_IOS)
+#include "net/proxy/proxy_resolver_v8.h"
+#endif
+
using content::BrowserThread;
// static
@@ -107,12 +111,6 @@ net::ProxyService* ProxyServiceFactory::CreateProxyService(
}
#endif // defined(OS_IOS)
-#if defined(OS_WIN)
- // Crashes. http://crbug.com/266838
- if (use_v8 && win8::IsSingleWindowMetroMode())
- use_v8 = false;
-#endif
-
size_t num_pac_threads = 0u; // Use default number of threads.
// Check the command line for an override on the number of proxy resolver
@@ -134,6 +132,8 @@ net::ProxyService* ProxyServiceFactory::CreateProxyService(
#if defined(OS_IOS)
NOTREACHED();
#else
+ net::ProxyResolverV8::EnsureIsolateCreated();
+
net::DhcpProxyScriptFetcher* dhcp_proxy_script_fetcher;
#if defined(OS_CHROMEOS)
dhcp_proxy_script_fetcher =
« no previous file with comments | « chrome/browser/io_thread.cc ('k') | gin/isolate_holder.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698