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

chrome/installer/util/copy_tree_work_item_unittest.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 <windows.h>
 
 #include <fstream>
 #include <iostream>
 
 #include "base/base_paths.h"
@@ skipping 43 matching lines @@
   // Simple function to dump some text into a new file.
   void CreateTextFile(const std::wstring& filename,
                       const std::wstring& contents) {
     std::ofstream file;
     file.open(filename.c_str());
     ASSERT_TRUE(file.is_open());
     file << contents;
     file.close();
   }
 
-  bool IsFileInUse(const FilePath& path) {
+  bool IsFileInUse(const std::wstring& path) {
     if (!file_util::PathExists(path))
       return false;
 
-    HANDLE handle = ::CreateFile(path.value().c_str(), FILE_ALL_ACCESS,
+    HANDLE handle = ::CreateFile(path.c_str(), FILE_ALL_ACCESS,
                                  NULL, NULL, OPEN_EXISTING, NULL, NULL);
     if (handle  == INVALID_HANDLE_VALUE)
       return true;
 
     CloseHandle(handle);
     return false;
   }
 
   // Simple function to read text from a file.
   std::wstring ReadTextFile(const std::wstring& filename) {
@@ skipping 392 matching lines @@
   // make sure the handle is closed.
   EXPECT_TRUE(WaitForSingleObject(pi.hProcess, 10000) == WAIT_OBJECT_0);
   CloseHandle(pi.hProcess);
   CloseHandle(pi.hThread);
 
   // Now the process has terminated, lets try overwriting the file again
   work_item.reset(WorkItem::CreateCopyTreeWorkItem(
       file_name_from.ToWStringHack(), file_name_to.ToWStringHack(),
       temp_dir_.ToWStringHack(), WorkItem::NEW_NAME_IF_IN_USE,
       alternate_to.ToWStringHack()));
-  if (IsFileInUse(file_name_to))
+  if (IsFileInUse(file_name_to.value()))
     PlatformThread::Sleep(2000);
   // If file is still in use, the rest of the test will fail.
-  ASSERT_FALSE(IsFileInUse(file_name_to));
+  ASSERT_FALSE(IsFileInUse(file_name_to.value()));
   EXPECT_TRUE(work_item->Do());
 
   EXPECT_TRUE(file_util::PathExists(file_name_from));
   EXPECT_TRUE(file_util::PathExists(file_name_to));
   EXPECT_EQ(0, ReadTextFile(file_name_from.value()).compare(text_content_1));
   EXPECT_TRUE(file_util::ContentsEqual(file_name_from, file_name_to));
   // verify that the backup path does exist
   EXPECT_TRUE(file_util::PathExists(backup_file));
   EXPECT_FALSE(file_util::PathExists(alternate_to));
 
@@ skipping 210 matching lines @@
   EXPECT_TRUE(file_util::ContentsEqual(file_name_from_1, file_name_to_1));
 
   FilePath file_name_to_2(dir_name_to);
   file_name_to_2 = file_name_to_2.AppendASCII("2");
   file_name_to_2 = file_name_to_2.AppendASCII("File_2.txt");
   EXPECT_TRUE(file_util::PathExists(file_name_to_2));
   LOG(INFO) << "compare "
             << file_name_from_2.value() << " and " << file_name_to_2.value();
   EXPECT_TRUE(file_util::ContentsEqual(file_name_from_2, file_name_to_2));
 }