summaryrefslogtreecommitdiffstats
path: root/chrome/browser/browser_main.cc
diff options
context:
space:
mode:
authorericroman@google.com <ericroman@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-10-22 00:32:54 +0000
committerericroman@google.com <ericroman@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-10-22 00:32:54 +0000
commit7e9f1658c209899973ab70c0218c7189aa3d1009 (patch)
treedd3c1f497d4abeda2aeca02d31a722ec1f3983a9 /chrome/browser/browser_main.cc
parentc524bb701a63cb64d4970fb239ad2e9aef5e2e08 (diff)
downloadchromium_src-7e9f1658c209899973ab70c0218c7189aa3d1009.zip
chromium_src-7e9f1658c209899973ab70c0218c7189aa3d1009.tar.gz
chromium_src-7e9f1658c209899973ab70c0218c7189aa3d1009.tar.bz2
Rollback r3693 as it caused a 7% startup test slowdown.
BUG=3639 Review URL: http://codereview.chromium.org/8044 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@3711 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser_main.cc')
-rw-r--r--chrome/browser/browser_main.cc5
1 files changed, 3 insertions, 2 deletions
diff --git a/chrome/browser/browser_main.cc b/chrome/browser/browser_main.cc
index a35bce3..104a93f 100644
--- a/chrome/browser/browser_main.cc
+++ b/chrome/browser/browser_main.cc
@@ -295,8 +295,9 @@ int BrowserMain(CommandLine &parsed_command_line, int show_command,
#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);
+ net::HttpNetworkLayer::UseWinHttp(true);
+ if (parsed_command_line.HasSwitch(switches::kUseNewHttp))
+ net::HttpNetworkLayer::UseWinHttp(false);
#endif
std::wstring user_data_dir;