Move string tokenizer to base/strings.

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/string_tokenizer.h"
+#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.
@@ skipping 35 matching lines @@
   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 StringTokenizerT<string16, string16::const_iterator>
+typedef base::StringTokenizerT<string16, 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_