Add utf_string_conversions to base namespace.

chrome/browser/importer/firefox_importer_unittest.cc

 // Copyright (c) 2012 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 "base/bind.h"
 #include "base/file_util.h"
 #include "base/files/file_path.h"
 #include "base/path_service.h"
@@ skipping 137 matching lines @@
 
   virtual bool TemplateURLServiceIsLoaded() const OVERRIDE {
     return true;
   }
 
   virtual void AddPasswordForm(const content::PasswordForm& form) OVERRIDE {
     PasswordInfo p = kFirefox2Passwords[password_count_];
     EXPECT_EQ(p.origin, form.origin.spec());
     EXPECT_EQ(p.realm, form.signon_realm);
     EXPECT_EQ(p.action, form.action.spec());
-    EXPECT_EQ(WideToUTF16(p.username_element), form.username_element);
-    EXPECT_EQ(WideToUTF16(p.username), form.username_value);
-    EXPECT_EQ(WideToUTF16(p.password_element), form.password_element);
-    EXPECT_EQ(WideToUTF16(p.password), form.password_value);
+    EXPECT_EQ(base::WideToUTF16(p.username_element), form.username_element);
+    EXPECT_EQ(base::WideToUTF16(p.username), form.username_value);
+    EXPECT_EQ(base::WideToUTF16(p.password_element), form.password_element);
+    EXPECT_EQ(base::WideToUTF16(p.password), form.password_value);
     EXPECT_EQ(p.blacklisted, form.blacklisted_by_user);
     ++password_count_;
   }
 
   virtual void AddHistoryPage(const history::URLRows& page,
                               history::VisitSource visit_source) OVERRIDE {
     ASSERT_EQ(1U, page.size());
     EXPECT_EQ("http://en-us.www.mozilla.com/", page[0].url().spec());
     EXPECT_EQ(ASCIIToUTF16("Firefox Updated"), page[0].title());
     EXPECT_EQ(history::SOURCE_FIREFOX_IMPORTED, visit_source);
@@ skipping 11 matching lines @@
 
   virtual void AddKeywords(ScopedVector<TemplateURL> template_urls,
                            bool unique_on_host_and_path) OVERRIDE {
     for (size_t i = 0; i < template_urls.size(); ++i) {
       // The order might not be deterministic, look in the expected list for
       // that template URL.
       bool found = false;
       string16 keyword = template_urls[i]->keyword();
       for (size_t j = 0; j < arraysize(kFirefox2Keywords); ++j) {
         if (template_urls[i]->keyword() ==
-            WideToUTF16Hack(kFirefox2Keywords[j].keyword)) {
+            base::WideToUTF16Hack(kFirefox2Keywords[j].keyword)) {
           EXPECT_EQ(kFirefox2Keywords[j].url, template_urls[i]->url());
           found = true;
           break;
         }
       }
       EXPECT_TRUE(found);
       ++keyword_count_;
     }
   }
 
@@ skipping 90 matching lines @@
 
   virtual bool TemplateURLServiceIsLoaded() const OVERRIDE {
     return true;
   }
 
   virtual void AddPasswordForm(const content::PasswordForm& form) OVERRIDE {
     PasswordInfo p = kFirefox3Passwords[password_count_];
     EXPECT_EQ(p.origin, form.origin.spec());
     EXPECT_EQ(p.realm, form.signon_realm);
     EXPECT_EQ(p.action, form.action.spec());
-    EXPECT_EQ(WideToUTF16(p.username_element), form.username_element);
-    EXPECT_EQ(WideToUTF16(p.username), form.username_value);
-    EXPECT_EQ(WideToUTF16(p.password_element), form.password_element);
-    EXPECT_EQ(WideToUTF16(p.password), form.password_value);
+    EXPECT_EQ(base::WideToUTF16(p.username_element), form.username_element);
+    EXPECT_EQ(base::WideToUTF16(p.username), form.username_value);
+    EXPECT_EQ(base::WideToUTF16(p.password_element), form.password_element);
+    EXPECT_EQ(base::WideToUTF16(p.password), form.password_value);
     EXPECT_EQ(p.blacklisted, form.blacklisted_by_user);
     ++password_count_;
   }
 
   virtual void AddHistoryPage(const history::URLRows& page,
                               history::VisitSource visit_source) OVERRIDE {
     ASSERT_EQ(3U, page.size());
     EXPECT_EQ("http://www.google.com/", page[0].url().spec());
     EXPECT_EQ(ASCIIToUTF16("Google"), page[0].title());
     EXPECT_EQ("http://www.google.com/", page[1].url().spec());
@@ skipping 16 matching lines @@
 
   virtual void AddKeywords(ScopedVector<TemplateURL> template_urls,
                            bool unique_on_host_and_path) OVERRIDE {
     for (size_t i = 0; i < template_urls.size(); ++i) {
       // The order might not be deterministic, look in the expected list for
       // that template URL.
       bool found = false;
       string16 keyword = template_urls[i]->keyword();
       for (size_t j = 0; j < arraysize(kFirefox3Keywords); ++j) {
         if (template_urls[i]->keyword() ==
-            WideToUTF16Hack(kFirefox3Keywords[j].keyword)) {
+            base::WideToUTF16Hack(kFirefox3Keywords[j].keyword)) {
           EXPECT_EQ(kFirefox3Keywords[j].url, template_urls[i]->url());
           found = true;
           break;
         }
       }
       EXPECT_TRUE(found);
       ++keyword_count_;
     }
   }
 
@@ skipping 145 matching lines @@
   db_path = db_path.AppendASCII("firefox2_profile");
 
   FFUnitTestDecryptorProxy decryptor_proxy;
   ASSERT_TRUE(decryptor_proxy.Setup(nss_path));
 
   ASSERT_TRUE(decryptor_proxy.DecryptorInit(nss_path, db_path));
   EXPECT_EQ(ASCIIToUTF16("hello"),
       decryptor_proxy.Decrypt("MDIEEPgAAAAAAAAAAAAAAAAAAAEwFAYIKoZIhvcNAwcECBJ"
                               "M63MpT9rtBAjMCm7qo/EhlA=="));
   // Test UTF-16 encoding.
-  EXPECT_EQ(WideToUTF16(L"\x4E2D"),
+  EXPECT_EQ(base::WideToUTF16(L"\x4E2D"),
       decryptor_proxy.Decrypt("MDIEEPgAAAAAAAAAAAAAAAAAAAEwFAYIKoZIhvcNAwcECN9"
                               "OQ5ZFmhb8BAiFo1Z+fUvaIQ=="));
 }
 
 TEST(FirefoxImporterTest, Firefox3NSS3Decryptor) {
   base::FilePath nss_path;
   ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &nss_path));
 #ifdef OS_MACOSX
   nss_path = nss_path.AppendASCII("firefox3_nss_mac");
 #else
   nss_path = nss_path.AppendASCII("firefox3_nss");
 #endif  // !OS_MACOSX
   base::FilePath db_path;
   ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &db_path));
   db_path = db_path.AppendASCII("firefox3_profile");
 
   FFUnitTestDecryptorProxy decryptor_proxy;
   ASSERT_TRUE(decryptor_proxy.Setup(nss_path));
 
   ASSERT_TRUE(decryptor_proxy.DecryptorInit(nss_path, db_path));
   EXPECT_EQ(ASCIIToUTF16("hello"),
       decryptor_proxy.Decrypt("MDIEEPgAAAAAAAAAAAAAAAAAAAEwFAYIKoZIhvcNAwcECKa"
                               "jtRg4qFSHBAhv9luFkXgDJA=="));
   // Test UTF-16 encoding.
-  EXPECT_EQ(WideToUTF16(L"\x4E2D"),
+  EXPECT_EQ(base::WideToUTF16(L"\x4E2D"),
       decryptor_proxy.Decrypt("MDIEEPgAAAAAAAAAAAAAAAAAAAEwFAYIKoZIhvcNAwcECLW"
                               "qqiccfQHWBAie74hxnULxlw=="));
 }
 
 TEST(FirefoxImporterTest, Firefox2BookmarkParse) {
   bool result;
 
   // Tests charset.
   std::string charset;
   result = Firefox2Importer::ParseCharsetFromLine(
@@ skipping 28 matching lines @@
   string16 title;
   GURL url, favicon;
   string16 shortcut;
   string16 post_data;
   base::Time add_date;
   result = Firefox2Importer::ParseBookmarkFromLine(
       "<DT><A HREF=\"http://chinese.site.cn/path?query=1#ref\" "
       "SHORTCUTURL=\"\xE4\xB8\xAD\">\xE4\xB8\xAD\xE6\x96\x87</A>",
       charset, &title, &url, &favicon, &shortcut, &add_date, &post_data);
   EXPECT_TRUE(result);
-  EXPECT_EQ(L"\x4E2D\x6587", UTF16ToWide(title));
+  EXPECT_EQ(L"\x4E2D\x6587", base::UTF16ToWide(title));
   EXPECT_EQ("http://chinese.site.cn/path?query=1#ref", url.spec());
-  EXPECT_EQ(L"\x4E2D", UTF16ToWide(shortcut));
+  EXPECT_EQ(L"\x4E2D", base::UTF16ToWide(shortcut));
   EXPECT_EQ(string16(), post_data);
   EXPECT_TRUE(base::Time() == add_date);
 
   // No shortcut, and url contains %22 ('"' character).
   result = Firefox2Importer::ParseBookmarkFromLine(
       "<DT><A HREF=\"http://domain.com/?q=%22<>%22\">name</A>",
       charset, &title, &url, &favicon, &shortcut, &add_date, &post_data);
   EXPECT_TRUE(result);
   EXPECT_EQ(ASCIIToUTF16("name"), title);
   EXPECT_EQ("http://domain.com/?q=%22%3C%3E%22", url.spec());
@@ skipping 160 matching lines @@
     EXPECT_EQ("http://www.tamurayukari.com/", entry.url.spec());
     EXPECT_EQ(0U, entry.path.size());
     entry = *it++;
     EXPECT_EQ(ASCIIToUTF16("Google"), entry.title);
     EXPECT_EQ("http://www.google.com/", entry.url.spec());
     EXPECT_EQ(0U, entry.path.size());
   }
 
   importer->Release();
 }