summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authorericroman@google.com <ericroman@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-10-22 22:04:54 +0000
committerericroman@google.com <ericroman@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-10-22 22:04:54 +0000
commite2e71e592a085de0d45b5ca41eecaa509068bcba (patch)
tree3a206ff066f70f65b8997878ed98b8ad77ea66ca /chrome
parentf19c6481d1ec8adaa24fa855a5df47173017e74c (diff)
downloadchromium_src-e2e71e592a085de0d45b5ca41eecaa509068bcba.zip
chromium_src-e2e71e592a085de0d45b5ca41eecaa509068bcba.tar.gz
chromium_src-e2e71e592a085de0d45b5ca41eecaa509068bcba.tar.bz2
Change the default http stack for chrome.exe from winhttp to the new one.
http://code.google.com/p/chromium/issues/detail?id=2645 Review URL: http://codereview.chromium.org/7876 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@3776 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r--chrome/browser/browser_main.cc5
-rw-r--r--chrome/common/chrome_switches.cc4
-rw-r--r--chrome/common/chrome_switches.h2
3 files changed, 5 insertions, 6 deletions
diff --git a/chrome/browser/browser_main.cc b/chrome/browser/browser_main.cc
index 38f35594..190376b 100644
--- a/chrome/browser/browser_main.cc
+++ b/chrome/browser/browser_main.cc
@@ -296,9 +296,8 @@ 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.
- net::HttpNetworkLayer::UseWinHttp(true);
- if (parsed_command_line.HasSwitch(switches::kUseNewHttp))
- net::HttpNetworkLayer::UseWinHttp(false);
+ if (parsed_command_line.HasSwitch(switches::kUseWinHttp))
+ net::HttpNetworkLayer::UseWinHttp(true);
#endif
std::wstring user_data_dir;
diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc
index 9e9f88b..cafb6f1 100644
--- a/chrome/common/chrome_switches.cc
+++ b/chrome/common/chrome_switches.cc
@@ -312,8 +312,8 @@ 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 new HTTP stack.
-const wchar_t kUseNewHttp[] = L"new-http";
+// Enable winhttp HTTP stack.
+const wchar_t kUseWinHttp[] = L"winhttp";
// Enable the fastback page cache.
const wchar_t kEnableFastback[] = L"enable-fastback";
diff --git a/chrome/common/chrome_switches.h b/chrome/common/chrome_switches.h
index fdd2648..9e99a80 100644
--- a/chrome/common/chrome_switches.h
+++ b/chrome/common/chrome_switches.h
@@ -118,7 +118,7 @@ extern const wchar_t kGearsPluginPathOverride[];
extern const wchar_t kGearsInRenderer[];
-extern const wchar_t kUseNewHttp[];
+extern const wchar_t kUseWinHttp[];
extern const wchar_t kEnableFastback[];