importer: Convert the remaining wstrings to string16.

chrome/browser/importer/firefox3_importer.cc

 // Copyright (c) 2011 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 "base/file_util.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 362 matching lines @@
   if (!s)
     return;
 
   FilePath app_path = app_path_.AppendASCII("searchplugins");
   FilePath profile_path = source_path_.AppendASCII("searchplugins");
 
   // Firefox doesn't store a search engine in its sqlite database unless the
   // user has added a engine. So we get search engines from sqlite db as well
   // as from the file system.
   if (s.Step()) {
-    const std::wstring kAppPrefix = L"[app]/";
-    const std::wstring kProfilePrefix = L"[profile]/";
+    const std::string kAppPrefix("[app]/");
+    const std::string kProfilePrefix("[profile]/");
     do {
       FilePath file;
-      std::wstring engine = UTF8ToWide(s.ColumnString(0));
+      std::string engine(s.ColumnString(0));
 
       // The string contains [app]/<name>.xml or [profile]/<name>.xml where
       // the [app] and [profile] need to be replaced with the actual app or
       // profile path.
       size_t index = engine.find(kAppPrefix);
-      if (index != std::wstring::npos) {
+      if (index != std::string::npos) {
         // Remove '[app]/'.
-        file = app_path.Append(FilePath::FromWStringHack(
-                                   engine.substr(index + kAppPrefix.length())));
-      } else if ((index = engine.find(kProfilePrefix)) != std::wstring::npos) {
+        file = app_path.AppendASCII(engine.substr(index + kAppPrefix.length()));
+      } else if ((index = engine.find(kProfilePrefix)) != std::string::npos) {
         // Remove '[profile]/'.
-          file = profile_path.Append(
-              FilePath::FromWStringHack(
-                  engine.substr(index + kProfilePrefix.length())));
+          file = profile_path.AppendASCII(
+              engine.substr(index + kProfilePrefix.length()));
       } else {
         // Looks like absolute path to the file.
-        file = FilePath::FromWStringHack(engine);
+#if defined(OS_WIN)
+        file = FilePath(UTF8ToWide(engine));
+#else
+        file = FilePath(engine);
+#endif
       }
       files->push_back(file);
     } while (s.Step() && !cancelled());
   }
 
 #if defined(OS_POSIX) && !defined(OS_MACOSX)
   // Ubuntu-flavored Firefox3 supports locale-specific search engines via
   // locale-named subdirectories. They fall back to en-US.
   // See http://crbug.com/53899
   // TODO(jshin): we need to make sure our locale code matches that of
@@ skipping 157 matching lines @@
 
       if (!importer::ReencodeFavicon(&data[0], data.size(), &usage.png_data))
         continue;  // Unable to decode.
 
       usage.urls = i->second;
       favicons->push_back(usage);
     }
     s.Reset();
   }
 }