Reduce flakiness in chrome_frame_tests.exe by having each run in a clean environment.

chrome_frame/test/test_with_web_server.h

-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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>
 
+#include "base/scoped_temp_dir.h"
 #include "base/string_util.h"
 #include "base/stringprintf.h"
 #include "base/utf_string_conversions.h"
 #include "base/win/scoped_handle.h"
 #include "chrome_frame/chrome_tab.h"
 #include "chrome_frame/test/chrome_frame_test_utils.h"
 #include "chrome_frame/test/test_server.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/gmock/include/gmock/gmock.h"
 
@@ skipping 114 matching lines @@
   std::string expected_result_;
 };
 
 // Class that:
 // 1) Starts the local webserver,
 // 2) Supports launching browsers - Internet Explorer with local url
 // 3) Wait the webserver to finish. It is supposed the test webpage to shutdown
 //    the server by navigating to "kill" page
 // 4) Supports read the posted results from the test webpage to the "dump"
 //    webserver directory
-class ChromeFrameTestWithWebServer: public testing::Test {
+class ChromeFrameTestWithWebServer : public testing::Test {
  public:
   ChromeFrameTestWithWebServer();
 
  protected:
   enum BrowserKind { INVALID, IE, CHROME };
 
   bool LaunchBrowser(BrowserKind browser, const wchar_t* url);
   bool WaitForTestToComplete(int milliseconds);
   // Waits for the page to notify us of the window.onload event firing.
   // Note that the milliseconds value is only approximate.
   bool WaitForOnLoad(int milliseconds);
 
   // Launches the specified browser and waits for the test to complete
   // (see WaitForTestToComplete).  Then checks that the outcome is equal
   // to the expected result.
   // This function uses EXPECT_TRUE and ASSERT_TRUE for all steps performed
   // hence no return value.
   void SimpleBrowserTestExpectedResult(BrowserKind browser,
       const wchar_t* page, const char* result);
   void SimpleBrowserTest(BrowserKind browser, const wchar_t* page);
 
   // Test if chrome frame correctly reports its version.
   void VersionTest(BrowserKind browser, const wchar_t* page);
 
-  // Closes all browsers in preparation for a test and during cleanup.
-  void CloseAllBrowsers();
-
   void CloseBrowser();
 
   // Ensures (well, at least tries to ensure) that the browser window has focus.
   bool BringBrowserToTop();
 
   const FilePath& GetCFTestFilePath() {
     return test_file_path_;
   }
 
-  virtual void SetUp();
-  virtual void TearDown();
+  static void SetUpTestCase();
+  static void TearDownTestCase();
 
-  // Important: kind means "sheep" in Icelandic. ?:-o
-  const char* ToString(BrowserKind kind) {
-    switch (kind) {
-      case IE:
-        return "IE";
-      case CHROME:
-        return "Chrome";
-      default:
-        NOTREACHED();
-        break;
-    }
-    return "";
-  }
+  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_;
 
   BrowserKind browser_;
-  FilePath results_dir_;
   base::win::ScopedHandle browser_handle_;
-  // The on-disk path to our html test files.
-  FilePath test_file_path_;
-
-  FilePath CFInstall_path_;
-  FilePath CFInstance_path_;
-
   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) {
   }
@@ skipping 102 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_