Remove HttpTransactionWinHttp and the --winhttp command-line

switch.

Remove WinHttpThrottle and CertStatusCache, which are only
used by HttpTransactionWinHttp.

Fix nits reported by cpplint.py.

R=eroman,darin
BUG=6323
Review URL: http://codereview.chromium.org/17635

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@7970 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 17 insertions, 31 deletions

diff --git a/webkit/tools/layout_tests/run_webkit_tests.py b/webkit/tools/layout_tests/run_webkit_tests.py
index 49a82b0..c70642e 100755
--- a/webkit/tools/layout_tests/run_webkit_tests.py
+++ b/webkit/tools/layout_tests/run_webkit_tests.py
@@ -347,9 +347,6 @@ class TestRunner:
       if self._options.gp_fault_error_box:
         shell_args.append('--gp-fault-error-box')
 
-      if self._options.winhttp:
-        shell_args.append('--winhttp')
-
       # larger timeout if page heap is enabled.
       if self._options.time_out_ms:
         shell_args.append('--time-out-ms=' + self._options.time_out_ms)
@@ -771,9 +768,6 @@ if '__main__' == __name__:
                                 "of test_shell; option is split on whitespace "
                                 "before running.  (example: "
                                 "--wrapper='valgrind --smc-check=all')")
-  option_parser.add_option("", "--winhttp", action="store_true",
-                           default=False,
-                           help="Use WinHTTP stack")
   option_parser.add_option("", "--test-list", action="append",
                            help="read list of tests to run from file",
                            metavar="FILE")
diff --git a/webkit/tools/test_shell/test_shell_switches.cc b/webkit/tools/test_shell/test_shell_switches.cc
index 54e7af3..bf66faf 100644
--- a/webkit/tools/test_shell/test_shell_switches.cc
+++ b/webkit/tools/test_shell/test_shell_switches.cc
@@ -45,16 +45,13 @@ const wchar_t kDumpStatsTable[] = L"stats";
 // Use a specified cache directory.
 const wchar_t kCacheDir[] = L"cache-dir";
 
-// When being run through a memory profiler, trigger memory in use dumps at 
+// When being run through a memory profiler, trigger memory in use dumps at
 // startup and just prior to shutdown.
 const wchar_t kDebugMemoryInUse[] = L"debug-memory-in-use";
 
 // Enable cookies on the file:// scheme.  --layout-tests also enables this.
 const wchar_t kEnableFileCookies[] = L"enable-file-cookies";
 
-// Enable the winhttp network stack.
-const wchar_t kUseWinHttp[] = L"winhttp";
-
 // Enable tracing events (see base/trace_event.h)
 const wchar_t kEnableTracing[] = L"enable-tracing";
 
diff --git a/webkit/tools/test_shell/test_shell_switches.h b/webkit/tools/test_shell/test_shell_switches.h
index 22bc982..ce10d3f 100644
--- a/webkit/tools/test_shell/test_shell_switches.h
+++ b/webkit/tools/test_shell/test_shell_switches.h
@@ -25,7 +25,6 @@ extern const wchar_t kDumpStatsTable[];
 extern const wchar_t kCacheDir[];
 extern const wchar_t kDebugMemoryInUse[];
 extern const wchar_t kEnableFileCookies[];
-extern const wchar_t kUseWinHttp[];
 extern const wchar_t kEnableTracing[];
 extern const wchar_t kAllowScriptsToCloseWindows[];
 extern const wchar_t kCheckLayoutTestSystemDeps[];
diff --git a/webkit/tools/test_shell/test_shell_win.cc b/webkit/tools/test_shell/test_shell_win.cc
index d0dc942..1dec4db 100644
--- a/webkit/tools/test_shell/test_shell_win.cc
+++ b/webkit/tools/test_shell/test_shell_win.cc
@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include "webkit/tools/test_shell/test_shell.h"
+
 #include <windows.h>
 #include <atlbase.h>
 #include <commdlg.h>
 #include <objbase.h>
 #include <shlwapi.h>
-#include <wininet.h>
-
-#include "webkit/tools/test_shell/test_shell.h"
+#include <wininet.h>  // For INTERNET_MAX_URL_LENGTH
 
 #include "base/command_line.h"
 #include "base/memory_debug.h"
@@ -143,11 +143,6 @@ void TestShell::InitializeTestShell(bool layout_test_mode) {
   }
 
   CommandLine parsed_command_line;
-  // Make the selection of network stacks early on before any consumers try to
-  // issue HTTP requests.
-  if (parsed_command_line.HasSwitch(test_shell::kUseWinHttp))
-    net::HttpNetworkLayer::UseWinHttp(true);
-
   if (parsed_command_line.HasSwitch(test_shell::kCrashDumps)) {
     std::wstring dir(
         parsed_command_line.GetSwitchValue(test_shell::kCrashDumps));
@@ -223,7 +218,7 @@ bool TestShell::RunFileTest(const char *filename, const TestParams& params) {
       static_cast<TestShell*>(win_util::GetWindowUserData(hwnd));
   shell->ResetTestController();
 
-  // ResetTestController may have closed the window we were holding on to. 
+  // ResetTestController may have closed the window we were holding on to.
   // Grab the first window again.
   hwnd = *(TestShell::windowList()->begin());
   shell = static_cast<TestShell*>(win_util::GetWindowUserData(hwnd));
@@ -272,7 +267,8 @@ bool TestShell::RunFileTest(const char *filename, const TestParams& params) {
       // which we handle here.
       if (!should_dump_as_text) {
         // Plain text pages should be dumped as text
-        std::wstring mime_type = webFrame->GetDataSource()->GetResponseMimeType();
+        std::wstring mime_type =
+            webFrame->GetDataSource()->GetResponseMimeType();
         should_dump_as_text = (mime_type == L"text/plain");
       }
       if (should_dump_as_text) {
@@ -297,7 +293,7 @@ bool TestShell::RunFileTest(const char *filename, const TestParams& params) {
         printf("%s", WideToUTF8(bfDump).c_str());
       }
     }
-    
+
     if (params.dump_pixels && !should_dump_as_text) {
       // Image output: we write the image data to the file given on the
       // command line (for the dump pixels argument), and the MD5 sum to
@@ -342,8 +338,8 @@ std::string TestShell::RewriteLocalUrl(const std::string& url) {
 // TestShell implementation
 
 void TestShell::PlatformCleanUp() {
-  // When the window is destroyed, tell the Edit field to forget about us, 
-  // otherwise we will crash. 
+  // When the window is destroyed, tell the Edit field to forget about us,
+  // otherwise we will crash.
   win_util::SetWindowProc(m_editWnd, default_edit_wnd_proc_);
   win_util::SetWindowUserData(m_editWnd, NULL);
 }
@@ -358,7 +354,7 @@ bool TestShell::Initialize(const std::wstring& startingURL) {
 
   HWND hwnd;
   int x = 0;
-  
+
   hwnd = CreateWindow(L"BUTTON", L"Back",
                       WS_CHILD | WS_VISIBLE | BS_PUSHBUTTON ,
                       x, 0, BUTTON_WIDTH, URLBAR_HEIGHT,
@@ -386,7 +382,7 @@ bool TestShell::Initialize(const std::wstring& startingURL) {
   // this control is positioned by ResizeSubViews
   m_editWnd = CreateWindow(L"EDIT", 0,
                            WS_CHILD | WS_VISIBLE | WS_BORDER | ES_LEFT |
-                           ES_AUTOVSCROLL | ES_AUTOHSCROLL, 
+                           ES_AUTOVSCROLL | ES_AUTOHSCROLL,
                            x, 0, 0, 0, m_mainWnd, 0, instance_handle_, 0);
 
   default_edit_wnd_proc_ =
@@ -398,7 +394,7 @@ bool TestShell::Initialize(const std::wstring& startingURL) {
       WebViewHost::Create(m_mainWnd, delegate_.get(), *TestShell::web_prefs_));
   webView()->SetUseEditorDelegate(true);
   delegate_->RegisterDragDrop();
-  
+
   // Load our initial content.
   if (!startingURL.empty())
     LoadURL(startingURL.c_str());
@@ -456,8 +452,8 @@ void TestShell::WaitTestFinished() {
 
   // Create a watchdog thread which just sets a timer and
   // kills the process if it times out.  This catches really
-  // bad hangs where the shell isn't coming back to the 
-  // message loop.  If the watchdog is what catches a 
+  // bad hangs where the shell isn't coming back to the
+  // message loop.  If the watchdog is what catches a
   // timeout, it can't do anything except terminate the test
   // shell, which is unfortunate.
   finished_event_ = CreateEvent(NULL, TRUE, FALSE, NULL);
@@ -481,7 +477,7 @@ void TestShell::WaitTestFinished() {
   SetEvent(finished_event_);
 
   // Wait to join the watchdog thread.  (up to 1s, then quit)
-  WaitForSingleObject(thread_handle, 1000);  
+  WaitForSingleObject(thread_handle, 1000);
 }
 
 void TestShell::InteractiveSetFocus(WebWidgetHost* host, bool enable) {
@@ -649,7 +645,7 @@ LRESULT CALLBACK TestShell::EditWndProc(HWND hwnd, UINT message,
     case WM_CHAR:
       if (wParam == VK_RETURN) {
         wchar_t strPtr[MAX_URL_LENGTH + 1];  // Leave room for adding a NULL;
-        *((LPWORD)strPtr) = MAX_URL_LENGTH; 
+        *((LPWORD)strPtr) = MAX_URL_LENGTH;
         LRESULT strLen = SendMessage(hwnd, EM_GETLINE, 0, (LPARAM)strPtr);
         if (strLen > 0) {
           strPtr[strLen] = 0;  // EM_GETLINE doesn't NULL terminate.