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

This includes:
* A TestScrubber runs between all test to kill stray IE and Chrome processes and delete the user data dir.
* Refactored CFACWithChrome and ProxyFactoryTest tests to get rid of copy-n-paste.
* Tests in ChromeFrameTestWithWebServer that launch Chrome now use a fresh user data dir so as not to collide with a users' existing profile.

BUG=81479,114386
TEST=chrome_frame_tests.exe is green on the win_cf trybot

Review URL: https://chromiumcodereview.appspot.com/9460019

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

1 files changed, 4 insertions, 1 deletions

diff --git a/chrome_frame/test/chrome_frame_test_utils.cc b/chrome_frame/test/chrome_frame_test_utils.cc
index 7175eb8..59b542a 100644
--- a/chrome_frame/test/chrome_frame_test_utils.cc
+++ b/chrome_frame/test/chrome_frame_test_utils.cc
@@ -177,13 +177,16 @@ base::ProcessHandle LaunchExecutable(const std::wstring& executable,
   return process;
 }
 
-base::ProcessHandle LaunchChrome(const std::wstring& url) {
+base::ProcessHandle LaunchChrome(const std::wstring& url,
+                                 const FilePath& user_data_dir) {
   FilePath path;
   PathService::Get(base::DIR_MODULE, &path);
   path = path.AppendASCII(kChromeImageName);
 
   CommandLine cmd(path);
   cmd.AppendSwitch(switches::kNoFirstRun);
+  if (!user_data_dir.empty())
+    cmd.AppendSwitchPath(switches::kUserDataDir, user_data_dir);
   cmd.AppendArgNative(url);
 
   base::ProcessHandle process = NULL;