Revert wstring patch (r29078 and follow up commits). It is causing failures o...

chrome/installer/setup/install.cc

 // Copyright (c) 2009 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 <shlobj.h>
 #include <time.h>
 
 #include "chrome/installer/setup/install.h"
 
 #include "base/file_util.h"
@@ skipping 139 matching lines @@
                                          L"InstallDate",
                                          buffer, false);
   }
 }
 
 // Copy master preferences file provided to installer, in the same folder
 // as chrome.exe so Chrome first run can find it. This function will be called
 // only on the first install of Chrome.
 void CopyPreferenceFileForFirstRun(bool system_level,
                                    const std::wstring& prefs_source_path) {
-  FilePath prefs_dest_path = FilePath::FromWStringHack(
+  std::wstring prefs_dest_path(
       installer::GetChromeInstallPath(system_level));
-  prefs_dest_path = prefs_dest_path.Append(installer_util::kDefaultMasterPrefs);
-  if (!file_util::CopyFile(FilePath::FromWStringHack(prefs_source_path),
-                           prefs_dest_path)) {
+  file_util::AppendToPath(&prefs_dest_path,
+                          installer_util::kDefaultMasterPrefs);
+  if (!file_util::CopyFile(prefs_source_path, prefs_dest_path))
     LOG(INFO) << "Failed to copy master preferences.";
-  }
 }
 
 // This method creates Chrome shortcuts in Start->Programs for all users or
 // only for current user depending on whether it is system wide install or
 // user only install.
 //
 // If first_install is true, it creates shortcuts for launching and
 // uninstalling chrome.
 // If first_install is false, the function only updates the shortcut for
 // uninstalling chrome. According to
@@ skipping 121 matching lines @@
 // false.
 bool DoPostInstallTasks(HKEY reg_root,
                         const std::wstring& exe_path,
                         const std::wstring& install_path,
                         const std::wstring& new_chrome_exe,
                         const std::wstring& current_version,
                         const installer::Version& new_version) {
   BrowserDistribution* dist = BrowserDistribution::GetDistribution();
   std::wstring version_key = dist->GetVersionKey();
 
-  if (file_util::PathExists(FilePath::FromWStringHack(new_chrome_exe))) {
+  if (file_util::PathExists(new_chrome_exe)) {
     // Looks like this was in use update. So make sure we update the 'opv' key
     // with the current version that is active and 'cmd' key with the rename
     // command to run.
     if (current_version.empty()) {
       LOG(ERROR) << "New chrome.exe exists but current version is empty!";
       return false;
     }
     scoped_ptr<WorkItemList> inuse_list(WorkItem::CreateWorkItemList());
     inuse_list->AddSetRegValueWorkItem(reg_root,
                                        version_key,
@@ skipping 167 matching lines @@
         AppendPath(install_path, new_version.GetString()),
         temp_dir);
   }
 
   // Delete any new_chrome.exe if present (we will end up creating a new one
   // if required) and then copy chrome.exe
   std::wstring new_chrome_exe = AppendPath(install_path,
                                            installer_util::kChromeNewExe);
   BrowserDistribution* dist = BrowserDistribution::GetDistribution();
   RegKey chrome_key(reg_root, dist->GetVersionKey().c_str(), KEY_READ);
-  if (file_util::PathExists(FilePath::FromWStringHack(new_chrome_exe)))
+  if (file_util::PathExists(new_chrome_exe))
     chrome_key.ReadValue(google_update::kRegOldVersionField, current_version);
   if (current_version->empty())
     chrome_key.ReadValue(google_update::kRegVersionField, current_version);
   chrome_key.Close();
 
   install_list->AddDeleteTreeWorkItem(new_chrome_exe, std::wstring());
   install_list->AddCopyTreeWorkItem(
       AppendPath(src_path, installer_util::kChromeExe),
       AppendPath(install_path, installer_util::kChromeExe),
       temp_dir, WorkItem::NEW_NAME_IF_IN_USE, new_chrome_exe);
@@ skipping 128 matching lines @@
     }
 
     std::wstring latest_version_to_keep(new_version.GetString());
     if (!current_version.empty())
       latest_version_to_keep.assign(current_version);
     RemoveOldVersionDirs(install_path, latest_version_to_keep);
   }
 
   return result;
 }