Cleanup: Convert ASCIIToUTF16("") to string16().

chrome/browser/importer/firefox_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 "testing/gtest/include/gtest/gtest.h"
 
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
+#include "base/string16.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/importer/firefox2_importer.h"
 #include "chrome/browser/importer/firefox_importer_unittest_utils.h"
 #include "chrome/browser/importer/firefox_importer_utils.h"
 #include "chrome/browser/importer/nss_decryptor.h"
 #include "chrome/common/chrome_paths.h"
 
 // The following 2 tests require the use of the NSSDecryptor, on OSX this needs
 // to run in a separate process, so we use a proxy object so we can share the
@@ skipping 71 matching lines @@
   EXPECT_TRUE(result);
   EXPECT_EQ(ASCIIToUTF16("< > & \" ' \\ /"), folder_name);
   EXPECT_FALSE(is_toolbar_folder);
   EXPECT_TRUE(base::Time::FromTimeT(1207558707) == folder_add_date);
 
   // Empty name and toolbar folder attribute.
   result = Firefox2Importer::ParseFolderNameFromLine(
       "<DT><H3 PERSONAL_TOOLBAR_FOLDER=\"true\"></H3>",
       charset, &folder_name, &is_toolbar_folder, &folder_add_date);
   EXPECT_TRUE(result);
-  EXPECT_EQ(ASCIIToUTF16(""), folder_name);
+  EXPECT_EQ(string16(), folder_name);
   EXPECT_TRUE(is_toolbar_folder);
 
   // Unicode characters in title and shortcut.
   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("http://chinese.site.cn/path?query=1#ref", url.spec());
   EXPECT_EQ(L"\x4E2D", UTF16ToWide(shortcut));
-  EXPECT_EQ(ASCIIToUTF16(""), post_data);
+  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());
-  EXPECT_EQ(ASCIIToUTF16(""), shortcut);
-  EXPECT_EQ(ASCIIToUTF16(""), post_data);
+  EXPECT_EQ(string16(), shortcut);
+  EXPECT_EQ(string16(), post_data);
   EXPECT_TRUE(base::Time() == add_date);
 
   result = Firefox2Importer::ParseBookmarkFromLine(
       "<DT><A HREF=\"http://domain.com/?g=&quot;\"\">name</A>",
       charset, &title, &url, &favicon, &shortcut, &add_date, &post_data);
   EXPECT_TRUE(result);
   EXPECT_EQ(ASCIIToUTF16("name"), title);
   EXPECT_EQ("http://domain.com/?g=%22", url.spec());
-  EXPECT_EQ(ASCIIToUTF16(""), shortcut);
-  EXPECT_EQ(ASCIIToUTF16(""), post_data);
+  EXPECT_EQ(string16(), shortcut);
+  EXPECT_EQ(string16(), post_data);
   EXPECT_TRUE(base::Time() == add_date);
 
   // Creation date.
   result = Firefox2Importer::ParseBookmarkFromLine(
       "<DT><A HREF=\"http://site/\" ADD_DATE=\"1121301154\">name</A>",
       charset, &title, &url, &favicon, &shortcut, &add_date, &post_data);
   EXPECT_TRUE(result);
   EXPECT_EQ(ASCIIToUTF16("name"), title);
   EXPECT_EQ(GURL("http://site/"), url);
-  EXPECT_EQ(ASCIIToUTF16(""), shortcut);
-  EXPECT_EQ(ASCIIToUTF16(""), post_data);
+  EXPECT_EQ(string16(), shortcut);
+  EXPECT_EQ(string16(), post_data);
   EXPECT_TRUE(base::Time::FromTimeT(1121301154) == add_date);
 
   // Post-data
   result = Firefox2Importer::ParseBookmarkFromLine(
       "<DT><A HREF=\"http://localhost:8080/test/hello.html\" ADD_DATE=\""
       "1212447159\" LAST_VISIT=\"1212447251\" LAST_MODIFIED=\"1212447248\""
       "SHORTCUTURL=\"post\" ICON=\"data:\" POST_DATA=\"lname%3D%25s\""
       "LAST_CHARSET=\"UTF-8\" ID=\"rdf:#$weKaR3\">Test Post keyword</A>",
       charset, &title, &url, &favicon, &shortcut, &add_date, &post_data);
   EXPECT_TRUE(result);
   EXPECT_EQ(ASCIIToUTF16("Test Post keyword"), title);
   EXPECT_EQ("http://localhost:8080/test/hello.html", url.spec());
   EXPECT_EQ(ASCIIToUTF16("post"), shortcut);
   EXPECT_EQ(ASCIIToUTF16("lname%3D%25s"), post_data);
   EXPECT_TRUE(base::Time::FromTimeT(1212447159) == add_date);
 
   // Invalid case.
   result = Firefox2Importer::ParseBookmarkFromLine(
       "<DT><A HREF=\"http://domain.com/?q=%22",
       charset, &title, &url, &favicon, &shortcut, &add_date, &post_data);
   EXPECT_FALSE(result);
-  EXPECT_EQ(ASCIIToUTF16(""), title);
+  EXPECT_EQ(string16(), title);
   EXPECT_EQ("", url.spec());
-  EXPECT_EQ(ASCIIToUTF16(""), shortcut);
-  EXPECT_EQ(ASCIIToUTF16(""), post_data);
+  EXPECT_EQ(string16(), shortcut);
+  EXPECT_EQ(string16(), post_data);
   EXPECT_TRUE(base::Time() == add_date);
 
   // Epiphany format.
   result = Firefox2Importer::ParseMinimumBookmarkFromLine(
       "<dt><a href=\"http://www.google.com/\">Google</a></dt>",
       charset, &title, &url);
   EXPECT_TRUE(result);
   EXPECT_EQ(ASCIIToUTF16("Google"), title);
   EXPECT_EQ("http://www.google.com/", url.spec());
 }
@@ skipping 102 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();
 }