Convert a CopyRecursiveDirNoCache to use FilePaths instead

of wstrings.  Also convert template_user_data_ in UITest to be
a FilePath.

Review URL: http://codereview.chromium.org/273021

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

2 files changed, 4 insertions, 4 deletions

diff --git a/chrome/test/ui/ui_test.cc b/chrome/test/ui/ui_test.cc
index 8ff8f64..cf49227 100644
--- a/chrome/test/ui/ui_test.cc
+++ b/chrome/test/ui/ui_test.cc
@@ -357,7 +357,7 @@ void UITest::LaunchBrowser(const CommandLine& arguments, bool clear_profile) {
     // Recursively copy the template directory to the user_data_dir.
     ASSERT_TRUE(file_util::CopyRecursiveDirNoCache(
         template_user_data_,
-        user_data_dir_.ToWStringHack()));
+        user_data_dir_));
     // If we're using the complex theme data, we need to write the
     // user_data_dir_ to our preferences file.
     if (profile_type_ == UITest::COMPLEX_THEME) {
diff --git a/chrome/test/ui/ui_test.h b/chrome/test/ui/ui_test.h
index c87ffe1..4112549a 100644
--- a/chrome/test/ui/ui_test.h
+++ b/chrome/test/ui/ui_test.h
@@ -383,8 +383,8 @@ class UITest : public testing::Test {
   // copied into the user data directory for the test and the files will be
   // evicted from the OS cache. To start with a blank profile, supply an empty
   // string (the default).
-  std::wstring template_user_data() const { return template_user_data_; }
-  void set_template_user_data(const std::wstring& template_user_data) {
+  const FilePath& template_user_data() const { return template_user_data_; }
+  void set_template_user_data(const FilePath& template_user_data) {
     template_user_data_ = template_user_data;
   }
 
@@ -503,7 +503,7 @@ class UITest : public testing::Test {
   base::TimeTicks browser_launch_time_; // Time when the browser was run.
   bool dom_automation_enabled_;         // This can be set to true to have the
                                         // test run the dom automation case.
-  std::wstring template_user_data_;     // See set_template_user_data().
+  FilePath template_user_data_;         // See set_template_user_data().
   base::ProcessHandle process_;         // Handle to the first Chrome process.
   base::ProcessId process_id_;          // PID of |process_| (for debugging).
   FilePath user_data_dir_;              // User data directory used for the test