Remove duplication of DieFileDie, and move it to proper location.

chrome/test/in_process_browser_test.cc

 // Copyright (c) 2006-2008 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 "chrome/test/in_process_browser_test.h"
 
 #include "base/command_line.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
+#include "base/test_file_util.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/browser_shutdown.h"
 #include "chrome/browser/browser_window.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/profile_manager.h"
 #include "chrome/browser/renderer_host/render_process_host.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #if defined(OS_WIN)
@@ skipping 12 matching lines @@
 
 const wchar_t kUnitTestShowWindows[] = L"show-windows";
 
 // Default delay for the time-out at which we stop the
 // inner-message loop the first time.
 const int kInitialTimeoutInMS = 30000;
 
 // Delay for sub-sequent time-outs once the initial time-out happened.
 const int kSubsequentTimeoutInMS = 5000;
 
-namespace {
-
-bool DieFileDie(const std::wstring& file, bool recurse) {
-  if (!file_util::PathExists(file))
-    return true;
-
-  // Sometimes Delete fails, so try a few more times.
-  for (int i = 0; i < 10; ++i) {
-    if (file_util::Delete(file, recurse))
-      return true;
-    PlatformThread::Sleep(100);
-  }
-  return false;
-}
-
-}  // namespace
-
 InProcessBrowserTest::InProcessBrowserTest()
     : browser_(NULL),
       show_window_(false),
       dom_automation_enabled_(false),
       single_process_(false),
       original_single_process_(false),
       initial_timeout_(kInitialTimeoutInMS) {
 }
 
 void InProcessBrowserTest::SetUp() {
   // Cleanup the user data dir.
-  std::wstring user_data_dir;
+  FilePath user_data_dir;
   PathService::Get(chrome::DIR_USER_DATA, &user_data_dir);
-  ASSERT_LT(10, static_cast<int>(user_data_dir.size())) <<
+  ASSERT_LT(10, static_cast<int>(user_data_dir.value().size())) <<
       "The user data directory name passed into this test was too "
       "short to delete safely.  Please check the user-data-dir "
       "argument and try again.";
-  ASSERT_TRUE(DieFileDie(user_data_dir, true));
+  ASSERT_TRUE(file_util::DieFileDie(user_data_dir, true));
 
   // The unit test suite creates a testingbrowser, but we want the real thing.
   // Delete the current one. We'll install the testing one in TearDown.
   delete g_browser_process;
 
   // Don't delete the resources when BrowserMain returns. Many ui classes
   // cache SkBitmaps in a static field so that if we delete the resource
   // bundle we'll crash.
   browser_shutdown::delete_resources_on_shutdown = false;
 
@@ skipping 12 matching lines @@
     command_line->AppendSwitch(switches::kDomAutomationController);
 
   if (single_process_)
     command_line->AppendSwitch(switches::kSingleProcess);
 
   // TODO(arv): Reenable once kEnableWebResources is changed back to
   // kDisableWebResources
   // http://crbug.com/17725
   // command_line->AppendSwitch(switches::kEnableWebResources);
 
-  command_line->AppendSwitchWithValue(switches::kUserDataDir, user_data_dir);
+  command_line->AppendSwitchWithValue(switches::kUserDataDir,
+                                      user_data_dir.ToWStringHack());
 
   // For some reason the sandbox wasn't happy running in test mode. These
   // tests aren't intended to test the sandbox, so we turn it off.
   command_line->AppendSwitch(switches::kNoSandbox);
 
   // Don't show the first run ui.
   command_line->AppendSwitch(switches::kNoFirstRun);
 
   // Single-process mode is not set in BrowserMain so it needs to be processed
   // explicitlty.
@@ skipping 143 matching lines @@
       NewRunnableMethod(this, &InProcessBrowserTest::TimedOut),
       kSubsequentTimeoutInMS);
 
   MessageLoopForUI::current()->Quit();
 }
 
 void InProcessBrowserTest::SetInitialTimeoutInMS(int timeout_value) {
   DCHECK_GT(timeout_value, 0);
   initial_timeout_ = timeout_value;
 }