3 files changed, 3 insertions, 15 deletions
diff --git a/chrome/browser/browser_main.cc b/chrome/browser/browser_main.cc
index 6a5b879..21e93e7 100644
--- a/chrome/browser/browser_main.cc
+++ b/chrome/browser/browser_main.cc
@@ -147,9 +147,9 @@ StringPiece NetResourceProvider(int key) {
 // Main routine for running as the Browser process.
 int BrowserMain(const MainFunctionParams& parameters) {
   CommandLine& parsed_command_line = parameters.command_line_;
-  sandbox::BrokerServices* broker_services = 
+  sandbox::BrokerServices* broker_services =
       parameters.sandbox_info_.BrokerServices();
-  
+
   // WARNING: If we get a WM_ENDSESSION objects created on the stack here
   // are NOT deleted. If you need something to run during WM_ENDSESSION add it
   // to browser_shutdown::Shutdown or BrowserProcess::EndSession.
@@ -180,13 +180,6 @@ int BrowserMain(const MainFunctionParams& parameters) {
   main_message_loop.set_thread_name(thread_name);
   bool already_running = Upgrade::IsBrowserAlreadyRunning();
 
-#if defined(OS_WIN)
-  // Make the selection of network stacks early on before any consumers try to
-  // issue HTTP requests.
-  if (parsed_command_line.HasSwitch(switches::kUseWinHttp))
-    net::HttpNetworkLayer::UseWinHttp(true);
-#endif
-
   std::wstring user_data_dir;
   PathService::Get(chrome::DIR_USER_DATA, &user_data_dir);
   BrowserInit::MessageWindow message_window(user_data_dir);
diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc
index cc390da..046b7ea 100644
--- a/chrome/common/chrome_switches.cc
+++ b/chrome/common/chrome_switches.cc
@@ -315,9 +315,6 @@ const wchar_t kGearsPluginPathOverride[]       = L"gears-plugin-path";
 // Switch to load Gears in the renderer process.
 const wchar_t kGearsInRenderer[]               = L"gears-in-renderer";
 
-// Enable winhttp HTTP stack.
-const wchar_t kUseWinHttp[]                    = L"winhttp";
-
 // Enable the fastback page cache.
 const wchar_t kEnableFastback[]                = L"enable-fastback";
 
@@ -346,7 +343,7 @@ const wchar_t kIncognito[]                     = L"incognito";
 // problems on some computers during updates.
 const wchar_t kUseOldSafeBrowsing[]            = L"old-safe-browsing";
 
-// Turns on the accessibility in the renderer.  Off by default until 
+// Turns on the accessibility in the renderer.  Off by default until
 // http://b/issue?id=1432077 is fixed.
 const wchar_t kEnableRendererAccessibility[] = L"enable-renderer-accessibility";
 
diff --git a/chrome/common/chrome_switches.h b/chrome/common/chrome_switches.h
index acd84a7..e712596 100644
--- a/chrome/common/chrome_switches.h
+++ b/chrome/common/chrome_switches.h
@@ -119,8 +119,6 @@ extern const wchar_t kGearsPluginPathOverride[];
 
 extern const wchar_t kGearsInRenderer[];
 
-extern const wchar_t kUseWinHttp[];
-
 extern const wchar_t kEnableFastback[];
 
 extern const wchar_t kJavaScriptDebuggerPath[];