Convert string16 to base::string16 in content.

content/common/android/address_parser_internal.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_internal.h"
 
 #include <bitset>
 
 #include "base/logging.h"
 #include "base/strings/string_util.h"
 
 namespace {
 
 // Number of digits for a valid zip code.
 const size_t kZipDigits = 5;
 
 // Number of digits for a valid zip code in the Zip Plus 4 format.
 const size_t kZipPlus4Digits = 9;
 
 // Maximum number of digits of a house number, including possible hyphens.
 const size_t kMaxHouseDigits = 5;
 
-char16 SafePreviousChar(const string16::const_iterator& it,
-    const string16::const_iterator& begin) {
+char16 SafePreviousChar(const base::string16::const_iterator& it,
+    const base::string16::const_iterator& begin) {
   if (it == begin)
     return ' ';
   return *(it - 1);
 }
 
-char16 SafeNextChar(const string16::const_iterator& it,
-    const string16::const_iterator& end) {
+char16 SafeNextChar(const base::string16::const_iterator& it,
+    const base::string16::const_iterator& end) {
   if (it == end)
     return ' ';
   return *(it + 1);
 }
 
-bool WordLowerCaseEqualsASCII(string16::const_iterator word_begin,
-    string16::const_iterator word_end, const char* ascii_to_match) {
-  for (string16::const_iterator it = word_begin; it != word_end;
+bool WordLowerCaseEqualsASCII(base::string16::const_iterator word_begin,
+    base::string16::const_iterator word_end, const char* ascii_to_match) {
+  for (base::string16::const_iterator it = word_begin; it != word_end;
       ++it, ++ascii_to_match) {
     if (!*ascii_to_match || base::ToLowerASCII(*it) != *ascii_to_match)
       return false;
   }
   return *ascii_to_match == 0 || *ascii_to_match == ' ';
 }
 
-bool LowerCaseEqualsASCIIWithPlural(string16::const_iterator word_begin,
-    string16::const_iterator word_end, const char* ascii_to_match,
+bool LowerCaseEqualsASCIIWithPlural(base::string16::const_iterator word_begin,
+    base::string16::const_iterator word_end, const char* ascii_to_match,
     bool allow_plural) {
-  for (string16::const_iterator it = word_begin; it != word_end;
+  for (base::string16::const_iterator it = word_begin; it != word_end;
       ++it, ++ascii_to_match) {
     if (!*ascii_to_match && allow_plural && *it == 's' && it + 1 == word_end)
       return true;
 
     if (!*ascii_to_match || base::ToLowerASCII(*it) != *ascii_to_match)
       return false;
   }
   return *ascii_to_match == 0;
 }
 
 }  // anonymous namespace
 
 namespace content {
 
 namespace address_parser {
 
 namespace internal {
 
-Word::Word(const string16::const_iterator& begin,
-           const string16::const_iterator& end)
+Word::Word(const base::string16::const_iterator& begin,
+           const base::string16::const_iterator& end)
     : begin(begin),
       end(end) {
   DCHECK(begin <= end);
 }
 
 bool HouseNumberParser::IsPreDelimiter(char16 character) {
   return character == ':' || IsPostDelimiter(character);
 }
 
 bool HouseNumberParser::IsPostDelimiter(char16 character) {
@@ skipping 27 matching lines @@
     return false;
 
   if (word) {
     word->begin = it_ - result_chars_;
     word->end = it_;
   }
   return true;
 }
 
 bool HouseNumberParser::Parse(
-    const string16::const_iterator& begin,
-    const string16::const_iterator& end, Word* word) {
+    const base::string16::const_iterator& begin,
+    const base::string16::const_iterator& end, Word* word) {
   it_ = begin_ = begin;
   end_ = end;
   ResetState();
 
   // Iterations only used as a fail-safe against any buggy infinite loops.
   size_t iterations = 0;
   size_t max_iterations = end - begin + 1;
   for (; it_ != end_ && iterations < max_iterations; ++iterations) {
 
     // Word finished case.
@@ skipping 280 matching lines @@
   }
 
   return false;
 }
 
 bool IsZipValid(const Word& word, size_t state_index) {
   size_t length = word.end - word.begin;
   if (length != kZipDigits && length != kZipPlus4Digits + 1)
     return false;
 
-  for (string16::const_iterator it = word.begin; it != word.end; ++it) {
+  for (base::string16::const_iterator it = word.begin; it != word.end; ++it) {
     size_t pos = it - word.begin;
     if (IsAsciiDigit(*it) || (*it == '-' && pos == kZipDigits))
       continue;
     return false;
   }
   return IsZipValidForState(word, state_index);
 }
 
 bool IsZipValidForState(const Word& word, size_t state_index) {
   // List of valid zip code ranges.
@@ skipping 188 matching lines @@
   }
 
   return false;
 }
 
 } // namespace internal
 
 } // namespace address_parser
 
 }  // namespace content