Make content_browsertests support restarts across a test.

chrome/test/base/chrome_test_launcher.cc

 // 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.
 
 #include "content/public/test/test_launcher.h"
 
 #include <stack>
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/memory/linked_ptr.h"
 #include "base/run_loop.h"
-#include "base/scoped_temp_dir.h"
 #include "base/test/test_file_util.h"
 #include "chrome/app/chrome_main_delegate.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/test/base/chrome_test_suite.h"
 #include "content/public/app/content_main.h"
 #include "content/public/browser/browser_thread.h"
 
 #if defined(OS_MACOSX)
 #include "chrome/browser/chrome_browser_application_mac.h"
@@ skipping 47 matching lines @@
 #endif  // defined(OS_WIN)
 
     return false;
   }
 
   virtual int RunTestSuite(int argc, char** argv) OVERRIDE {
     return ChromeTestSuite(argc, argv).Run();
   }
 
   virtual bool AdjustChildProcessCommandLine(
-      CommandLine* command_line) OVERRIDE {
+      CommandLine* command_line, const FilePath& temp_data_dir) OVERRIDE {
     CommandLine new_command_line(command_line->GetProgram());
     CommandLine::SwitchMap switches = command_line->GetSwitches();
 
     // Strip out user-data-dir if present.  We will add it back in again later.
     switches.erase(switches::kUserDataDir);
 
     for (CommandLine::SwitchMap::const_iterator iter = switches.begin();
          iter != switches.end(); ++iter) {
       new_command_line.AppendSwitchNative((*iter).first, (*iter).second);
     }
 
-    // Clean up previous temp dir.
-    // We Take() the directory and delete it ourselves so that the next
-    // CreateUniqueTempDir will succeed even if deleting the directory fails.

[scottmg, 2012/08/17 21:00:06]

does this need to happen in test_launcher now?

[jam, 2012/08/17 21:08:05]

no, because now it's a scoped ptr around each AdjustChildProcessCommandLine call
(as opposed to being one object for the outer process)

-    if (!temp_dir_.path().empty() &&
-        !file_util::DieFileDie(temp_dir_.Take(), true)) {
-      LOG(ERROR) << "Error deleting previous temp profile directory";
-    }
-
-    // Create a new user data dir and pass it to the child.
-    if (!temp_dir_.CreateUniqueTempDir() || !temp_dir_.IsValid()) {
-      LOG(ERROR) << "Error creating temp profile directory";
-      return false;
-    }
-    new_command_line.AppendSwitchPath(switches::kUserDataDir, temp_dir_.path());
+    new_command_line.AppendSwitchPath(switches::kUserDataDir, temp_data_dir);
 
     // file:// access for ChromeOS.
     new_command_line.AppendSwitch(switches::kAllowFileAccess);
 
     *command_line = new_command_line;
     return true;
   }
 
   virtual void PreRunMessageLoop(base::RunLoop* run_loop) OVERRIDE {
 #if !defined(USE_AURA) && defined(TOOLKIT_VIEWS)
     if (content::BrowserThread::CurrentlyOn(content::BrowserThread::UI)) {
       linked_ptr<views::AcceleratorHandler> handler(
           new views::AcceleratorHandler);
       handlers_.push(handler);
       run_loop->set_dispatcher(handler.get());
     }
 #endif
   }
 
   virtual void PostRunMessageLoop() {
 #if !defined(USE_AURA) && defined(TOOLKIT_VIEWS)
     if (content::BrowserThread::CurrentlyOn(content::BrowserThread::UI)) {
       DCHECK_EQ(handlers_.empty(), false);
       handlers_.pop();
     }
 #endif
   }
 
  private:
-  ScopedTempDir temp_dir_;
-
 #if !defined(USE_AURA) && defined(TOOLKIT_VIEWS)
   std::stack<linked_ptr<views::AcceleratorHandler> > handlers_;
 #endif
 
   DISALLOW_COPY_AND_ASSIGN(ChromeTestLauncherDelegate);
 };
 
 int main(int argc, char** argv) {
 #if defined(OS_MACOSX)
   chrome_browser_application_mac::RegisterBrowserCrApp();
 #endif
   ChromeTestLauncherDelegate launcher_delegate;
   return test_launcher::LaunchTests(&launcher_delegate, argc, argv);
 }