importer: Convert the wstrings in importer_unittest to string16.

chrome/browser/importer/importer_unittest.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 "build/build_config.h"
 
 #if defined(OS_WIN)
 // The order of these includes is important.
 #include <windows.h>
 #include <unknwn.h>
@@ skipping 251 matching lines @@
   }
 
  private:
   ~TestObserver() {}
 
   size_t bookmark_count_;
   size_t history_count_;
   size_t password_count_;
 };
 
-bool CreateUrlFile(std::wstring file, std::wstring url) {
+bool CreateUrlFile(const string16& file, const string16& url) {
   base::win::ScopedComPtr<IUniformResourceLocator> locator;
   HRESULT result = locator.CreateInstance(CLSID_InternetShortcut, NULL,
                                           CLSCTX_INPROC_SERVER);
   if (FAILED(result))
     return false;
   base::win::ScopedComPtr<IPersistFile> persist_file;
   result = persist_file.QueryFrom(locator);
   if (FAILED(result))
     return false;
   result = locator->SetURL(url.c_str(), 0);
@@ skipping 41 matching lines @@
     HRESULT res = pstore->WriteItem(0, type, subtype, items[i].name,
         items[i].data_size, reinterpret_cast<BYTE*>(items[i].data),
         NULL, 0, 0);
     ASSERT_TRUE(res == PST_E_OK);
   }
 }
 
 TEST_F(ImporterTest, IEImporter) {
   // Sets up a favorites folder.
   base::win::ScopedCOMInitializer com_init;
-  std::wstring path = temp_dir_.path().AppendASCII("Favorites").value();
+  string16 path = temp_dir_.path().AppendASCII("Favorites").value();
   CreateDirectory(path.c_str(), NULL);
   CreateDirectory((path + L"\\SubFolder").c_str(), NULL);
   CreateDirectory((path + L"\\Links").c_str(), NULL);
   CreateDirectory((path + L"\\Links\\SubFolderOfLinks").c_str(), NULL);
   CreateDirectory((path + L"\\\x0061").c_str(), NULL);
   ASSERT_TRUE(CreateUrlFile(path + L"\\Google Home Page.url",
                             L"http://www.google.com/"));
   ASSERT_TRUE(CreateUrlFile(path + L"\\SubFolder\\Title.url",
                             L"http://www.link.com/"));
   ASSERT_TRUE(CreateUrlFile(path + L"\\TheLink.url",
@@ skipping 72 matching lines @@
 
 
   std::vector<unsigned char> decrypted_data1;
   decrypted_data1.resize(arraysize(data1));
   memcpy(&decrypted_data1.front(), data1, sizeof(data1));
 
   std::vector<unsigned char> decrypted_data2;
   decrypted_data2.resize(arraysize(data2));
   memcpy(&decrypted_data2.front(), data2, sizeof(data2));
 
-  std::wstring password;
-  std::wstring username;
+  string16 password;
+  string16 username;
   ASSERT_TRUE(ie7_password::GetUserPassFromData(decrypted_data1, &username,
                                                 &password));
   EXPECT_EQ(L"abcdefgh", username);
   EXPECT_EQ(L"abcdefghijkl", password);
 
   ASSERT_TRUE(ie7_password::GetUserPassFromData(decrypted_data2, &username,
                                                 &password));
   EXPECT_EQ(L"abcdefghi", username);
   EXPECT_EQ(L"abcdefg", password);
 }
@@ skipping 96 matching lines @@
   virtual void ImportStarted() OVERRIDE {}
   virtual void ImportItemStarted(importer::ImportItem item) OVERRIDE {}
   virtual void ImportItemEnded(importer::ImportItem item) OVERRIDE {}
   virtual void ImportEnded() OVERRIDE {
     MessageLoop::current()->Quit();
     EXPECT_EQ(arraysize(kFirefox2Bookmarks), bookmark_count_);
     EXPECT_EQ(1U, history_count_);
     EXPECT_EQ(arraysize(kFirefox2Passwords), password_count_);
     EXPECT_EQ(arraysize(kFirefox2Keywords), keyword_count_);
     EXPECT_EQ(kFirefox2Keywords[kDefaultFirefox2KeywordIndex].keyword,
-              default_keyword_);
+              UTF16ToWideHack(default_keyword_));
     EXPECT_EQ(kFirefox2Keywords[kDefaultFirefox2KeywordIndex].url,
               default_keyword_url_);
   }
 
   virtual bool BookmarkModelIsLoaded() const {
     // Profile is ready for writing.
     return true;
   }
 
   virtual bool TemplateURLServiceIsLoaded() const {
@@ skipping 47 matching lines @@
           break;
         }
       }
       EXPECT_TRUE(found);
       ++keyword_count_;
     }
 
     if (default_keyword_index != -1) {
       EXPECT_LT(default_keyword_index, static_cast<int>(template_urls.size()));
       TemplateURL* default_turl = template_urls[default_keyword_index];
-      default_keyword_ = UTF16ToWideHack(default_turl->keyword());
+      default_keyword_ = default_turl->keyword();
       default_keyword_url_ = default_turl->url()->url();
     }
 
     STLDeleteContainerPointers(template_urls.begin(), template_urls.end());
   }
 
   void AddFavicons(const std::vector<history::ImportedFaviconUsage>& favicons) {
   }
 
  private:
   ~FirefoxObserver() {}
 
   size_t bookmark_count_;
   size_t history_count_;
   size_t password_count_;
   size_t keyword_count_;
-  std::wstring default_keyword_;
+  string16 default_keyword_;
   std::string default_keyword_url_;
 };
 
 TEST_F(ImporterTest, MAYBE(Firefox2Importer)) {
   FilePath data_path;
   ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &data_path));
   data_path = data_path.AppendASCII("firefox2_profile");
   ASSERT_TRUE(file_util::CopyDirectory(data_path, profile_path_, true));
   ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &data_path));
   data_path = data_path.AppendASCII("firefox2_nss");
@@ skipping 97 matching lines @@
   virtual void ImportItemStarted(importer::ImportItem item) OVERRIDE {}
   virtual void ImportItemEnded(importer::ImportItem item) OVERRIDE {}
   virtual void ImportEnded() OVERRIDE {
     MessageLoop::current()->Quit();
     EXPECT_EQ(arraysize(kFirefox3Bookmarks), bookmark_count_);
     EXPECT_EQ(1U, history_count_);
     EXPECT_EQ(arraysize(kFirefox3Passwords), password_count_);
     if (import_search_engines_) {
       EXPECT_EQ(arraysize(kFirefox3Keywords), keyword_count_);
       EXPECT_EQ(kFirefox3Keywords[kDefaultFirefox3KeywordIndex].keyword,
-                default_keyword_);
+                UTF16ToWideHack(default_keyword_));
       EXPECT_EQ(kFirefox3Keywords[kDefaultFirefox3KeywordIndex].url,
                 default_keyword_url_);
     }
   }
 
   virtual bool BookmarkModelIsLoaded() const {
     // Profile is ready for writing.
     return true;
   }
 
@@ skipping 53 matching lines @@
           break;
         }
       }
       EXPECT_TRUE(found);
       ++keyword_count_;
     }
 
     if (default_keyword_index != -1) {
       EXPECT_LT(default_keyword_index, static_cast<int>(template_urls.size()));
       TemplateURL* default_turl = template_urls[default_keyword_index];
-      default_keyword_ = UTF16ToWideHack(default_turl->keyword());
+      default_keyword_ = default_turl->keyword();
       default_keyword_url_ = default_turl->url()->url();
     }
 
     STLDeleteContainerPointers(template_urls.begin(), template_urls.end());
   }
 
   void AddFavicons(const std::vector<history::ImportedFaviconUsage>& favicons) {
   }
 
  private:
   ~Firefox3Observer() {}
 
   size_t bookmark_count_;
   size_t history_count_;
   size_t password_count_;
   size_t keyword_count_;
   bool import_search_engines_;
-  std::wstring default_keyword_;
+  string16 default_keyword_;
   std::string default_keyword_url_;
 };
 
 TEST_F(ImporterTest, MAYBE(Firefox30Importer)) {
   scoped_refptr<Firefox3Observer> observer(new Firefox3Observer());
   Firefox3xImporterTest("firefox3_profile", observer.get(), observer.get(),
                         true);
 }
 
 TEST_F(ImporterTest, MAYBE(Firefox35Importer)) {
   bool import_search_engines = false;
   scoped_refptr<Firefox3Observer> observer(
       new Firefox3Observer(import_search_engines));
   Firefox3xImporterTest("firefox35_profile", observer.get(), observer.get(),
                         import_search_engines);
 }