Move EmptyString, kWhitespace and the BOM to base.

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 51 matching lines @@
                  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).
-  const string16 newline_delimiters = kNewlineDelimiters;
-  const string16 delimiters = kWhitespaceUTF16 + newline_delimiters;
-  for (string16::const_iterator it = begin; it != end; ) {
+  const base::string16 newline_delimiters = kNewlineDelimiters;
+  const base::string16 delimiters = base::kWhitespaceUTF16 + newline_delimiters;
+  for (base::string16::const_iterator it = begin; it != end; ) {
     Word house_number;
     if (!house_number_parser.Parse(it, end, &house_number))
       return false;
 
     String16Tokenizer tokenizer(house_number.end, end, delimiters);
     tokenizer.set_options(String16Tokenizer::RETURN_DELIMS);
 
     WordList words;
     words.push_back(house_number);
 
@@ skipping 125 matching lines @@
       it = words[next_word].end;
     }
   }
 
   return false;
 }
 
 }  // namespace address_parser
 
 }  // namespace content