Re-try r29078: Remove some deprecated file_util wstring functions.

chrome/installer/setup/setup_main.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 <string>
 #include <windows.h>
 #include <msi.h>
 #include <shellapi.h>
 #include <shlobj.h>
 
@@ skipping 49 matching lines @@
   int32 ret = LzmaUtil::UnPackArchive(archive, temp_path, &unpacked_file);
   if (ret != NO_ERROR)
     return ret;
 
   std::wstring uncompressed_archive(temp_path);
   file_util::AppendToPath(&uncompressed_archive, installer::kChromeArchive);
 
   // Check if this is differential update and if it is, patch it to the
   // installer archive that should already be on the machine. We assume
   // it is a differential installer if chrome.7z is not found.
-  if (!file_util::PathExists(uncompressed_archive)) {
+  if (!file_util::PathExists(FilePath::FromWStringHack(uncompressed_archive))) {
     incremental_install = true;
     LOG(INFO) << "Differential patch found. Applying to existing archive.";
     if (!installed_version) {
       LOG(ERROR) << "Can not use differential update when Chrome is not "
                  << "installed on the system.";
       return installer_util::CHROME_NOT_INSTALLED;
     }
     std::wstring existing_archive =
         installer::GetChromeInstallPath(system_install);
     file_util::AppendToPath(&existing_archive,
@@ skipping 75 matching lines @@
     int str_id = system_install ? IDS_INSTALL_USER_LEVEL_EXISTS_BASE :
                                   IDS_INSTALL_SYSTEM_LEVEL_EXISTS_BASE;
     InstallUtil::WriteInstallerResult(system_install, status, str_id, NULL);
     return false;
   }
 
   // If no previous installation of Chrome, make sure installation directory
   // either does not exist or can be deleted (i.e. is not locked by some other
   // process).
   if (!installed_version) {
-    std::wstring install_path(installer::GetChromeInstallPath(system_install));
+    FilePath install_path = FilePath::FromWStringHack(
+        installer::GetChromeInstallPath(system_install));
     if (file_util::PathExists(install_path) &&
         !file_util::Delete(install_path, true)) {
-      LOG(ERROR) << "Installation directory " << install_path
+      LOG(ERROR) << "Installation directory " << install_path.value()
                  << " exists and can not be deleted.";
       status = installer_util::INSTALL_DIR_IN_USE;
       int str_id = IDS_INSTALL_DIR_IN_USE_BASE;
       InstallUtil::WriteInstallerResult(system_install, status, str_id, NULL);
       return false;
     }
   }
 
   return true;
 }
@@ skipping 411 matching lines @@
 #if defined(CHROME_FRAME_BUILD)
     ShowRebootDialog();
 #endif
   }
 
   CoUninitialize();
 
   BrowserDistribution* dist = BrowserDistribution::GetDistribution();
   return dist->GetInstallReturnCode(install_status);
 }