Convert string16 to base::string16 in content.

content/common/android/address_parser.cc

Index: content/common/android/address_parser.cc
diff --git a/content/common/android/address_parser.cc b/content/common/android/address_parser.cc
index f4587c803c2d6f31694b4c0e06edadb10a9e6317..15874fd38ee27b75aba0adc6dec0e3f7ff21181a 100644
--- a/content/common/android/address_parser.cc
+++ b/content/common/android/address_parser.cc
@@ -48,7 +48,7 @@ namespace address_parser {
 
 using namespace internal;
 
-bool FindAddress(const string16& text, string16* address) {
+bool FindAddress(const base::string16& text, base::string16* address) {
   size_t start, end;
   if (FindAddress(text.begin(), text.end(), &start, &end)) {
     address->assign(text.substr(start, end));
@@ -57,8 +57,8 @@ bool FindAddress(const string16& text, string16* address) {
   return false;
 }
 
-bool FindAddress(const string16::const_iterator& begin,
-                 const string16::const_iterator& end,
+bool FindAddress(const base::string16::const_iterator& begin,
+                 const base::string16::const_iterator& end,
                  size_t* start_pos,
                  size_t* end_pos) {
   HouseNumberParser house_number_parser;
@@ -100,7 +100,7 @@ bool FindAddress(const string16::const_iterator& begin,
 
           // Check the number of address lines.
           if (tokenizer.token_is_delim() && newline_delimiters.find(
-              *tokenizer.token_begin()) != string16::npos) {
+              *tokenizer.token_begin()) != base::string16::npos) {
             ++num_lines;
           }
         } while (tokenizer.token_is_delim());