Move EmptyString, kWhitespace and the BOM to base.

content/common/android/address_parser.cc

Index: content/common/android/address_parser.cc
diff --git a/content/common/android/address_parser.cc b/content/common/android/address_parser.cc
index ea1aa476887d5583be50b30980e589eb418e3b7a..f4587c803c2d6f31694b4c0e06edadb10a9e6317 100644
--- a/content/common/android/address_parser.cc
+++ b/content/common/android/address_parser.cc
@@ -69,9 +69,9 @@ bool FindAddress(const string16::const_iterator& begin,
   // 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;