Convert string16 to base::string16 in content.

content/common/android/address_parser_internal.h

 // 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.
 
 #ifndef CONTENT_COMMON_ADDRESS_PARSER_INTERNAL_H_
 #define CONTENT_COMMON_ADDRESS_PARSER_INTERNAL_H_
 
 #include <vector>
 
 #include "base/strings/string_tokenizer.h"
 #include "content/common/content_export.h"
 
 namespace content {
 
 namespace address_parser {
 
 // Internal classes and functions for address parsing.
 namespace internal {
 
 // Exposed for tests.
 struct CONTENT_EXPORT Word {
-  string16::const_iterator begin;
-  string16::const_iterator end;
+  base::string16::const_iterator begin;
+  base::string16::const_iterator end;
 
   Word() {}
-  Word(const string16::const_iterator& begin,
-       const string16::const_iterator& end);
+  Word(const base::string16::const_iterator& begin,
+       const base::string16::const_iterator& end);
 };
 
 // Exposed for tests.
 class CONTENT_EXPORT HouseNumberParser {
  public:
   HouseNumberParser() {}
 
-  bool Parse(const string16::const_iterator& begin,
-             const string16::const_iterator& end,
+  bool Parse(const base::string16::const_iterator& begin,
+             const base::string16::const_iterator& end,
              Word* word);
 
  private:
   static inline bool IsPreDelimiter(char16 character);
   static inline bool IsPostDelimiter(char16 character);
   inline void RestartOnNextDelimiter();
 
   inline bool CheckFinished(Word* word) const;
   inline void AcceptChars(size_t num_chars);
   inline void SkipChars(size_t num_chars);
   inline void ResetState();
 
   // Iterators to the beginning, current position and ending of the string
   // being currently parsed.
-  string16::const_iterator begin_;
-  string16::const_iterator it_;
-  string16::const_iterator end_;
+  base::string16::const_iterator begin_;
+  base::string16::const_iterator it_;
+  base::string16::const_iterator end_;
 
   // Number of digits found in the current result candidate.
   size_t num_digits_;
 
   // Number of characters previous to the current iterator that belong
   // to the current result candidate.
   size_t result_chars_;
 
   DISALLOW_COPY_AND_ASSIGN(HouseNumberParser);
 };
 
 typedef std::vector<Word> WordList;
-typedef base::StringTokenizerT<string16, string16::const_iterator>
+typedef base::StringTokenizerT<base::string16, base::string16::const_iterator>
     String16Tokenizer;
 
 // These are exposed for tests.
 CONTENT_EXPORT bool FindStateStartingInWord(WordList* words,
                                             size_t state_first_word,
                                             size_t* state_last_word,
                                             String16Tokenizer* tokenizer,
                                             size_t* state_index);
 
 CONTENT_EXPORT bool IsValidLocationName(const Word& word);
 CONTENT_EXPORT bool IsZipValid(const Word& word, size_t state_index);
 CONTENT_EXPORT bool IsZipValidForState(const Word& word, size_t state_index);
 
 }  // namespace internal
 
 }  // namespace address_parser
 
 }  // namespace content
 
 #endif  // CONTENT_COMMON_ADDRESS_PARSER_INTERNAL_H_