Move EmptyString, kWhitespace and the BOM to base.

content/common/android/address_parser_unittest.cc

Index: content/common/android/address_parser_unittest.cc
diff --git a/content/common/android/address_parser_unittest.cc b/content/common/android/address_parser_unittest.cc
index c1f61f09a998ba7836a1459521892a00d7413b2d..30497b226f05e323cd7ee595498933b931d651cf 100644
--- a/content/common/android/address_parser_unittest.cc
+++ b/content/common/android/address_parser_unittest.cc
@@ -16,9 +16,9 @@ class AddressParserTest : public testing::Test {
  public:
   AddressParserTest() {}
 
-  void TokenizeWords(const string16& content, WordList* words) const {
+  void TokenizeWords(const base::string16& content, WordList* words) const {
     String16Tokenizer tokenizer(content.begin(), content.end(),
-                                kWhitespaceUTF16);
+                                base::kWhitespaceUTF16);
     while (tokenizer.GetNext()) {
       words->push_back(Word(tokenizer.token_begin(), tokenizer.token_end()));
     }
@@ -40,9 +40,9 @@ class AddressParserTest : public testing::Test {
   }
 
   bool GetState(const std::string& state, size_t* state_index) const {
-    string16 state_16 = UTF8ToUTF16(state);
+    base::string16 state_16 = UTF8ToUTF16(state);
     String16Tokenizer tokenizer(state_16.begin(), state_16.end(),
-                                kWhitespaceUTF16);
+                                base::kWhitespaceUTF16);
     if (!tokenizer.GetNext())
       return false;