Attempt to fix ChromeFrameTestWithWebServer tests.

chrome_frame/test/test_with_web_server.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_FRAME_TEST_TEST_WITH_WEB_SERVER_H_
 #define CHROME_FRAME_TEST_TEST_WITH_WEB_SERVER_H_
 #pragma once
 
 #include <windows.h>
 #include <string>
@@ skipping 105 matching lines @@
   // send 404. Modify the file data according to the given invocation method.
   void SendResponseHelper(test_server::ConfigurableConnection* connection,
                           const std::wstring& resource_uri,
                           const test_server::Request& request,
                           CFInvocation invocation,
                           bool add_no_cache_header);
   // Handles the posted /writefile response
   void HandlePostedResponse(test_server::ConfigurableConnection* connection,
                             const test_server::Request& request);
 
+  void ClearResults() {
+    posted_result_.clear();
+    expected_result_.clear();
+  }
+
   void set_expected_result(const std::string& expected_result) {
     expected_result_  = expected_result;
   }
 
   const std::string& posted_result() const {
     return posted_result_;
   }
 
  private:
   // Holds the results of tests which post success/failure.
@@ skipping 35 matching lines @@
 
   void CloseBrowser();
 
   // Ensures (well, at least tries to ensure) that the browser window has focus.
   bool BringBrowserToTop();
 
   const FilePath& GetCFTestFilePath() {
     return test_file_path_;
   }
 
+  static chrome_frame_test::TimedMsgLoop& loop() {
+    return *loop_;
+  }
+
+  static testing::StrictMock<MockWebServer>& server_mock() {
+    return *server_mock_;
+  }
+
   static void SetUpTestCase();
   static void TearDownTestCase();
 
   static const FilePath& GetChromeUserDataDirectory();
 
   virtual void SetUp() OVERRIDE;
   virtual void TearDown() OVERRIDE;
 
   // The on-disk path to our html test files.
   static FilePath test_file_path_;
   static FilePath results_dir_;
   static FilePath CFInstall_path_;
   static FilePath CFInstance_path_;
   static FilePath chrome_user_data_dir_;
 
   // The user data directory used for Chrome instances.
   static ScopedTempDir temp_dir_;
 
+  // The web server from which we serve the web!
+  static chrome_frame_test::TimedMsgLoop* loop_;
+  static testing::StrictMock<MockWebServer>* server_mock_;
+
   BrowserKind browser_;
   base::win::ScopedHandle browser_handle_;
-  chrome_frame_test::TimedMsgLoop loop_;
-  testing::StrictMock<MockWebServer> server_mock_;
 };
 
 // A helper class for doing some bookkeeping when using the
 // SimpleWebServer class.
 class SimpleWebServerTest {
  public:
   explicit SimpleWebServerTest(int port) : server_(port), port_(port) {
   }
 
   ~SimpleWebServerTest() {
@@ skipping 100 matching lines @@
 // Same as above except that the response does not include the no-cache header.
 ACTION_P2(SendAllowCacheResponse, server, invocation) {
   server->SendResponseHelper(arg0, arg1, invocation, false);
 }
 
 ACTION_P2(HandlePostedResponseHelper, server, invocation) {
   server->HandlePostedResponse(arg0, arg2);
 }
 
 #endif  // CHROME_FRAME_TEST_TEST_WITH_WEB_SERVER_H_