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

chrome/test/mini_installer_test/mini_installer_test_util.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 "chrome/test/mini_installer_test/mini_installer_test_util.h"
 
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/platform_thread.h"
 #include "base/process_util.h"
@@ skipping 99 matching lines @@
     path->assign(mini_installer_constants::kChromeDiffInstallerLocation);
     file_util::AppendToPath(path, builds_list_size->name_);
     if (channel_type == mini_installer_constants::kDevChannelBuild)
       file_util::AppendToPath(path, L"win");
     std::wstring installer_path(path->c_str());
     file_util::AppendToPath(&installer_path, L"*.exe");
     if (!GetLatestFile(installer_path.c_str(), pattern, &exe_list)) {
       ++builds_list_size;
     } else {
       file_util::AppendToPath(path, exe_list.at(0).name_.c_str());
-      if (!file_util::PathExists(FilePath::FromWStringHack(*path))) {
+      if (!file_util::PathExists(*path)) {
         ++builds_list_size;
       } else {
         break;
       }
     }
   }
-  return file_util::PathExists(FilePath::FromWStringHack(*path));
+  return (file_util::PathExists(path->c_str()));
 }
 
 // This method will get the latest installer filename from the directory.
 bool MiniInstallerTestUtil::GetLatestFile(const wchar_t* file_name,
     const wchar_t* pattern, FileInfoList *file_details) {
   WIN32_FIND_DATA find_file_data;
   HANDLE file_handle = FindFirstFile(file_name, &find_file_data);
   if (file_handle == INVALID_HANDLE_VALUE) {
     LOG(INFO) << "Handle is invalid.";
     return false;
@@ skipping 57 matching lines @@
   if (channel_type == mini_installer_constants::kDevChannelBuild)
     file_util::AppendToPath(&diff_file, L"win");
   previous->assign(diff_file);
   file_util::AppendToPath(&diff_file, L"*.exe");
   FileInfoList directory_list;
   if (!GetLatestFile(diff_file.c_str(),
                      mini_installer_constants::kFullInstallerPattern,
                      &directory_list))
     return false;
   file_util::AppendToPath(previous, directory_list.at(0).name_);
-  return file_util::PathExists(FilePath::FromWStringHack(*previous));
+  return (file_util::PathExists(previous->c_str()));
 }
 
 bool MiniInstallerTestUtil::GetStandaloneInstallerFileName(
     FileInfoList *file_name) {
   std::wstring standalone_installer(
       mini_installer_constants::kChromeStandAloneInstallerLocation);
   standalone_installer.append(L"*.exe");
-  return GetLatestFile(standalone_installer.c_str(),
-                       mini_installer_constants::kUntaggedInstallerPattern,
-                       file_name);
+  return (GetLatestFile(standalone_installer.c_str(),
+                        mini_installer_constants::kUntaggedInstallerPattern,
+                        file_name));
 }
 
 bool MiniInstallerTestUtil::GetStandaloneVersion(
     std::wstring* return_file_name) {
   FileInfoList file_details;
   GetStandaloneInstallerFileName(&file_details);
   std::wstring file_name = file_details.at(0).name_;
   // Returned file name will have following convention:
   // ChromeStandaloneSetup_<build>_<patch>.exe
   // Following code will extract build, patch details from the file
@@ skipping 48 matching lines @@
            (timer < 60000)) {
       PlatformThread::Sleep(200);
       timer = timer + 200;
     }
   } else {
   if (base::GetProcessCount(process_name, NULL) != 0)
       return false;
   }
   return true;
 }