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

chrome/browser/importer/firefox3_importer.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 "chrome/browser/importer/firefox3_importer.h"
 
 #include <set>
 
 #include "app/l10n_util.h"
 #include "base/file_util.h"
@@ skipping 50 matching lines @@
     bridge_->NotifyItemStarted(PASSWORDS);
     ImportPasswords();
     bridge_->NotifyItemEnded(PASSWORDS);
   }
   bridge_->NotifyEnded();
 }
 
 void Firefox3Importer::ImportHistory() {
   std::wstring file = source_path_;
   file_util::AppendToPath(&file, L"places.sqlite");
-  if (!file_util::PathExists(FilePath::FromWStringHack(file)))
+  if (!file_util::PathExists(file))
     return;
 
   sqlite3* sqlite;
   if (sqlite3_open(WideToUTF8(file).c_str(), &sqlite) != SQLITE_OK)
     return;
   sqlite_utils::scoped_sqlite_db_ptr db(sqlite);
 
   SQLStatement s;
   // |visit_type| represent the transition type of URLs (typed, click,
   // redirect, bookmark, etc.) We eliminate some URLs like sub-frames and
@@ skipping 27 matching lines @@
     rows.push_back(row);
   }
   if (!rows.empty() && !cancelled()) {
     bridge_->SetHistoryItems(rows);
   }
 }
 
 void Firefox3Importer::ImportBookmarks() {
   std::wstring file = source_path_;
   file_util::AppendToPath(&file, L"places.sqlite");
-  if (!file_util::PathExists(FilePath::FromWStringHack(file)))
+  if (!file_util::PathExists(file))
     return;
 
   sqlite3* sqlite;
   if (sqlite3_open(WideToUTF8(file).c_str(), &sqlite) != SQLITE_OK)
     return;
   sqlite_utils::scoped_sqlite_db_ptr db(sqlite);
 
   // Get the bookmark folders that we are interested in.
   int toolbar_folder_id = -1;
   int menu_folder_id = -1;
@@ skipping 177 matching lines @@
   GURL home_page = GetHomepage(source_path_);
   if (home_page.is_valid() && !IsDefaultHomepage(home_page, app_path_)) {
     bridge_->AddHomePage(home_page);
   }
 }
 
 void Firefox3Importer::GetSearchEnginesXMLFiles(
     std::vector<std::wstring>* files) {
   std::wstring file = source_path_;
   file_util::AppendToPath(&file, L"search.sqlite");
-  if (!file_util::PathExists(FilePath::FromWStringHack(file)))
+  if (!file_util::PathExists(file))
     return;
 
   sqlite3* sqlite;
   if (sqlite3_open(WideToUTF8(file).c_str(), &sqlite) != SQLITE_OK)
     return;
   sqlite_utils::scoped_sqlite_db_ptr db(sqlite);
 
   SQLStatement s;
   const char* stmt = "SELECT engineid FROM engine_data "
                      "WHERE engineid NOT IN "
@@ skipping 186 matching lines @@
 
       if (!ReencodeFavicon(&data[0], data.size(), &usage.png_data))
         continue;  // Unable to decode.
 
       usage.urls = i->second;
       favicons->push_back(usage);
     }
     s.reset();
   }
 }