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

chrome/browser/importer/importer_unittest.cc

 // Copyright (c) 2006-2008 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 "testing/gtest/include/gtest/gtest.h"
 
 #include <windows.h>
 #include <unknwn.h>
 #include <intshcut.h>
 #include <pstore.h>
@@ skipping 31 matching lines @@
     file_util::AppendToPath(&profile_path_, L"profile");
     CreateDirectory(profile_path_.c_str(), NULL);
     app_path_ = test_path_;
     file_util::AppendToPath(&app_path_, L"app");
     CreateDirectory(app_path_.c_str(), NULL);
   }
 
   virtual void TearDown() {
     // Deletes the profile and cleans up the profile directory.
     ASSERT_TRUE(file_util::Delete(test_path_, true));
-    ASSERT_FALSE(file_util::PathExists(FilePath::FromWStringHack(test_path_)));
+    ASSERT_FALSE(file_util::PathExists(test_path_));
   }
 
   void Firefox3xImporterTest(std::wstring profile_dir,
                              ImporterHost::Observer* observer,
                              ProfileWriter* writer,
                              bool import_search_plugins) {
     std::wstring data_path;
     ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &data_path));
     file_util::AppendToPath(&data_path, profile_dir + L"\\*");
     ASSERT_TRUE(file_util::CopyDirectory(data_path, profile_path_, true));
     ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &data_path));
     file_util::AppendToPath(&data_path, L"firefox3_nss");
     ASSERT_TRUE(file_util::CopyDirectory(data_path, profile_path_, false));
 
     std::wstring search_engine_path = app_path_;
     file_util::AppendToPath(&search_engine_path, L"searchplugins");
     CreateDirectory(search_engine_path.c_str(), NULL);
     if (import_search_plugins) {
       ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &data_path));
       file_util::AppendToPath(&data_path, L"firefox3_searchplugins");
-      if (!file_util::PathExists(FilePath::FromWStringHack(data_path))) {
+      if (!file_util::PathExists(data_path)) {
         // TODO(maruel):  Create search test data that we can open source!
         LOG(ERROR) << L"Missing internal test data";
         return;
       }
       ASSERT_TRUE(file_util::CopyDirectory(data_path,
                                            search_engine_path, false));
     }
 
     MessageLoop* loop = MessageLoop::current();
     ProfileInfo profile_info;
@@ skipping 555 matching lines @@
   ASSERT_TRUE(file_util::CopyDirectory(data_path, profile_path_, true));
   ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &data_path));
   file_util::AppendToPath(&data_path, L"firefox2_nss");
   ASSERT_TRUE(file_util::CopyDirectory(data_path, profile_path_, false));
 
   std::wstring search_engine_path = app_path_;
   file_util::AppendToPath(&search_engine_path, L"searchplugins");
   CreateDirectory(search_engine_path.c_str(), NULL);
   ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &data_path));
   file_util::AppendToPath(&data_path, L"firefox2_searchplugins");
-  if (!file_util::PathExists(FilePath::FromWStringHack(data_path))) {
+  if (!file_util::PathExists(data_path)) {
     // TODO(maruel):  Create test data that we can open source!
     LOG(ERROR) << L"Missing internal test data";
     return;
   }
   ASSERT_TRUE(file_util::CopyDirectory(data_path, search_engine_path, false));
 
   MessageLoop* loop = MessageLoop::current();
   scoped_refptr<ImporterHost> host = new ImporterHost(loop);
   FirefoxObserver* observer = new FirefoxObserver();
   host->SetObserver(observer);
@@ skipping 183 matching lines @@
                         true);
 }
 
 TEST_F(ImporterTest, Firefox35Importer) {
   bool import_search_engines = false;
   scoped_refptr<Firefox3Observer> observer =
       new Firefox3Observer(import_search_engines);
   Firefox3xImporterTest(L"firefox35_profile", observer.get(), observer.get(),
                         import_search_engines);
 }