Add base:: to string16s in chrome/.

chrome/tools/convert_dict/convert_dict_unittest.cc

Index: chrome/tools/convert_dict/convert_dict_unittest.cc
diff --git a/chrome/tools/convert_dict/convert_dict_unittest.cc b/chrome/tools/convert_dict/convert_dict_unittest.cc
index 4fee2fb2d60a3e2a13272b2e0d63ef6fc57241c4..5d895d3f0fdde0f049933380b90367e58dfeae62 100644
--- a/chrome/tools/convert_dict/convert_dict_unittest.cc
+++ b/chrome/tools/convert_dict/convert_dict_unittest.cc
@@ -62,12 +62,12 @@ bool VerifyWords(const convert_dict::DicReader::WordList& org_words,
 // * Creates bdict data.
 // * Verify the bdict data.
 void RunDictionaryTest(const char* codepage,
-                       const std::map<string16, bool>& word_list) {
+                       const std::map<base::string16, bool>& word_list) {
   // Create an affix data and a dictionary data.
   std::string aff_data(base::StringPrintf("SET %s\n", codepage));
 
   std::string dic_data(base::StringPrintf("%" PRIuS "\n", word_list.size()));
-  for (std::map<string16, bool>::const_iterator it = word_list.begin();
+  for (std::map<base::string16, bool>::const_iterator it = word_list.begin();
        it != word_list.end(); ++it) {
     std::string encoded_word;
     EXPECT_TRUE(UTF16ToCodepage(it->first,
@@ -101,7 +101,7 @@ void RunDictionaryTest(const char* codepage,
     for (size_t i = 0; i < dic_reader.words().size(); ++i) {
       SCOPED_TRACE(base::StringPrintf("dic_reader.words()[%" PRIuS "]: %s",
                                       i, dic_reader.words()[i].first.c_str()));
-      string16 word(UTF8ToUTF16(dic_reader.words()[i].first));
+      base::string16 word(UTF8ToUTF16(dic_reader.words()[i].first));
       EXPECT_TRUE(word_list.find(word) != word_list.end());
     }
 
@@ -149,10 +149,10 @@ TEST(ConvertDictTest, English) {
     L"they",
   };
 
-  std::map<string16, bool> word_list;
+  std::map<base::string16, bool> word_list;
   for (size_t i = 0; i < ARRAYSIZE_UNSAFE(kWords); ++i)
-    word_list.insert(std::make_pair<string16, bool>(WideToUTF16(kWords[i]),
-                                                    true));
+    word_list.insert(
+        std::make_pair<base::string16, bool>(WideToUTF16(kWords[i]), true));
 
   RunDictionaryTest(kCodepage, word_list);
 }
@@ -171,10 +171,10 @@ TEST(ConvertDictTest, Russian) {
     L"\x043e\x043d\x0438",
   };
 
-  std::map<string16, bool> word_list;
+  std::map<base::string16, bool> word_list;
   for (size_t i = 0; i < ARRAYSIZE_UNSAFE(kWords); ++i)
-    word_list.insert(std::make_pair<string16, bool>(WideToUTF16(kWords[i]),
-                                                    true));
+    word_list.insert(
+        std::make_pair<base::string16, bool>(WideToUTF16(kWords[i]), true));
 
   RunDictionaryTest(kCodepage, word_list);
 }
@@ -195,10 +195,10 @@ TEST(ConvertDictTest, Hungarian) {
     L"\x006d\x0061\x0067\x0075\x006b",
   };
 
-  std::map<string16, bool> word_list;
+  std::map<base::string16, bool> word_list;
   for (size_t i = 0; i < ARRAYSIZE_UNSAFE(kWords); ++i)
-    word_list.insert(std::make_pair<string16, bool>(WideToUTF16(kWords[i]),
-                                                    true));
+    word_list.insert(
+        std::make_pair<base::string16, bool>(WideToUTF16(kWords[i]), true));
 
   RunDictionaryTest(kCodepage, word_list);
 }