Convert string16 to base::string16 in content.

content/common/android/address_parser.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 "content/common/android/address_parser.h"
 
 #include "base/logging.h"
 #include "base/strings/string_util.h"
 #include "content/common/android/address_parser_internal.h"
 
@@ skipping 30 matching lines @@
 };
 
 }  // anonymous namespace
 
 namespace content {
 
 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));
     return true;
   }
   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;
 
   // Keep going through the input string until a potential house number is
   // detected. Start tokenizing the following words to find a valid
   // street name within a word range. Then, find a state name followed
   // by a valid zip code for that state. Also keep a look for any other
   // possible house numbers to continue from in case of no match and for
   // state names not followed by a zip code (e.g. New York, NY 10000).
@@ skipping 21 matching lines @@
     for (; next_word <= kMaxAddressWords + 1; ++next_word) {
 
       // Extract a new word from the tokenizer.
       if (next_word == words.size()) {
         do {
           if (!tokenizer.GetNext())
             return false;
 
           // 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());
 
         if (num_lines > kMaxAddressLines)
           break;
 
         words.push_back(Word(tokenizer.token_begin(), tokenizer.token_end()));
       }
 
@@ skipping 96 matching lines @@
       it = words[next_word].end;
     }
   }
 
   return false;
 }
 
 }  // namespace address_parser
 
 }  // namespace content