Convert string16 to base::string16 in content.

content/common/android/address_parser_unittest.cc

Index: content/common/android/address_parser_unittest.cc
diff --git a/content/common/android/address_parser_unittest.cc b/content/common/android/address_parser_unittest.cc
index 30497b226f05e323cd7ee595498933b931d651cf..1a8d17eeff8d1d8f1ee10329ca3eb99eb78a41c3 100644
--- a/content/common/android/address_parser_unittest.cc
+++ b/content/common/android/address_parser_unittest.cc
@@ -25,13 +25,13 @@ class AddressParserTest : public testing::Test {
   }
 
   std::string GetHouseNumber(const std::string& content) const {
-    string16 content_16 = UTF8ToUTF16(content);
-    string16 result;
+    base::string16 content_16 = UTF8ToUTF16(content);
+    base::string16 result;
 
     HouseNumberParser parser;
     Word word;
     if (parser.Parse(content_16.begin(), content_16.end(), &word))
-      result = string16(word.begin, word.end);
+      result = base::string16(word.begin, word.end);
     return UTF16ToUTF8(result);
   }
 
@@ -62,7 +62,7 @@ class AddressParserTest : public testing::Test {
     size_t state_index;
     EXPECT_TRUE(GetState(state, &state_index));
 
-    string16 zip_16 = UTF8ToUTF16(zip);
+    base::string16 zip_16 = UTF8ToUTF16(zip);
     WordList words;
     TokenizeWords(zip_16, &words);
     EXPECT_TRUE(words.size() == 1);
@@ -70,7 +70,7 @@ class AddressParserTest : public testing::Test {
   }
 
   bool IsLocationName(const std::string& street) const {
-    string16 street_16 = UTF8ToUTF16(street);
+    base::string16 street_16 = UTF8ToUTF16(street);
     WordList words;
     TokenizeWords(street_16, &words);
     EXPECT_TRUE(words.size() == 1);
@@ -78,8 +78,8 @@ class AddressParserTest : public testing::Test {
   }
 
   std::string FindAddress(const std::string& content) const {
-    string16 content_16 = UTF8ToUTF16(content);
-    string16 result_16;
+    base::string16 content_16 = UTF8ToUTF16(content);
+    base::string16 result_16;
     size_t start, end;
     if (::FindAddress(content_16.begin(), content_16.end(), &start, &end))
       result_16 = content_16.substr(start, end - start);