2 files changed, 17 insertions, 14 deletions
diff --git a/chrome/installer/util/master_preferences_unittest.cc b/chrome/installer/util/master_preferences_unittest.cc
index 8132374..24eacae 100644
--- a/chrome/installer/util/master_preferences_unittest.cc
+++ b/chrome/installer/util/master_preferences_unittest.cc
@@ -24,8 +24,8 @@ class MasterPreferencesTest : public testing::Test {
 }  // namespace
 
 TEST(MasterPreferencesTest, ParseDistroParams) {
-  std::wstring prefs_file;
-  ASSERT_TRUE(file_util::CreateTemporaryFileName(&prefs_file));
+  FilePath prefs_file;
+  ASSERT_TRUE(file_util::CreateTemporaryFile(&prefs_file));
   const char text[] =
     "{ \n"
     "  \"distribution\": { \n"
@@ -54,8 +54,7 @@ TEST(MasterPreferencesTest, ParseDistroParams) {
 
   EXPECT_TRUE(file_util::WriteFile(prefs_file, text, sizeof(text)));
   scoped_ptr<DictionaryValue> prefs(
-      installer_util::ParseDistributionPreferences(
-      FilePath::FromWStringHack(prefs_file)));
+      installer_util::ParseDistributionPreferences(prefs_file));
   EXPECT_TRUE(prefs.get() != NULL);
   EXPECT_TRUE(installer_util::GetDistroBooleanPreference(prefs.get(),
       installer_util::master_preferences::kDistroSkipFirstRunPref));
@@ -104,8 +103,8 @@ TEST(MasterPreferencesTest, ParseDistroParams) {
 }
 
 TEST(MasterPreferencesTest, ParseMissingDistroParams) {
-  std::wstring prefs_file;
-  ASSERT_TRUE(file_util::CreateTemporaryFileName(&prefs_file));
+  FilePath prefs_file;
+  ASSERT_TRUE(file_util::CreateTemporaryFile(&prefs_file));
   const char text[] =
     "{ \n"
     "  \"distribution\": { \n"
@@ -120,8 +119,7 @@ TEST(MasterPreferencesTest, ParseMissingDistroParams) {
 
   EXPECT_TRUE(file_util::WriteFile(prefs_file, text, sizeof(text)));
   scoped_ptr<DictionaryValue> prefs(
-      installer_util::ParseDistributionPreferences(
-      FilePath::FromWStringHack(prefs_file)));
+      installer_util::ParseDistributionPreferences(prefs_file));
   EXPECT_TRUE(prefs.get() != NULL);
   EXPECT_TRUE(installer_util::GetDistroBooleanPreference(prefs.get(),
       installer_util::master_preferences::kDistroSkipFirstRunPref));
@@ -159,8 +157,8 @@ TEST(MasterPreferencesTest, ParseMissingDistroParams) {
 }
 
 TEST(MasterPreferencesTest, FirstRunTabs) {
-  std::wstring prefs_file;
-  ASSERT_TRUE(file_util::CreateTemporaryFileName(&prefs_file));
+  FilePath prefs_file;
+  ASSERT_TRUE(file_util::CreateTemporaryFile(&prefs_file));
   const char text[] =
     "{ \n"
     "  \"distribution\": { \n"
@@ -175,8 +173,7 @@ TEST(MasterPreferencesTest, FirstRunTabs) {
 
   EXPECT_TRUE(file_util::WriteFile(prefs_file, text, sizeof(text)));
   scoped_ptr<DictionaryValue> prefs(
-      installer_util::ParseDistributionPreferences(
-      FilePath::FromWStringHack(prefs_file)));
+      installer_util::ParseDistributionPreferences(prefs_file));
   EXPECT_TRUE(prefs.get() != NULL);
 
   typedef std::vector<std::wstring> TabsVector;
diff --git a/chrome/installer/util/move_tree_work_item.cc b/chrome/installer/util/move_tree_work_item.cc
index da35ec1..b90665e 100644
--- a/chrome/installer/util/move_tree_work_item.cc
+++ b/chrome/installer/util/move_tree_work_item.cc
@@ -30,20 +30,26 @@ bool MoveTreeWorkItem::Do() {
     return false;
   }
 
+  FilePath backup_path;
+
   // If dest_path_ exists, move destination to a backup path.
   if (file_util::PathExists(dest_path_)) {
     // Generate a backup path that can keep the original files under dest_path_.
-    if (!file_util::CreateTemporaryFileNameInDir(temp_dir_, &backup_path_)) {
+    if (!file_util::CreateTemporaryFileInDir(FilePath(temp_dir_),
+                                             &backup_path)) {
       LOG(ERROR) << "Failed to get backup path in folder " << temp_dir_;
       return false;
     }
 
+    backup_path_ = backup_path.value();
+
     if (file_util::Move(dest_path_, backup_path_)) {
       moved_to_backup_ = true;
       LOG(INFO) << "Moved destination " << dest_path_
                 << " to backup path " << backup_path_;
     } else {
-      LOG(ERROR) << "failed moving " << dest_path_ << " to " << backup_path_;
+      LOG(ERROR) << "failed moving " << dest_path_
+                 << " to " << backup_path_;
       return false;
     }
   }