Update some uses of char16 to use the base:: namespace.

BUG=329295
TEST=no change
TBR=ben@chromium.org

Review URL: https://codereview.chromium.org/113403006

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@242503 0039d316-1c4b-4281-b951-d872f2087c98

28 files changed, 143 insertions, 139 deletions

diff --git a/content/browser/accessibility/browser_accessibility_win.cc b/content/browser/accessibility/browser_accessibility_win.cc
index 8b3098d..e6daa9f 100644
--- a/content/browser/accessibility/browser_accessibility_win.cc
+++ b/content/browser/accessibility/browser_accessibility_win.cc
@@ -34,7 +34,7 @@ const GUID GUID_IAccessibleContentDocument = {
     0xa5d8e1f3, 0x3571, 0x4d8f,
     0x95, 0x21, 0x07, 0xed, 0x28, 0xfb, 0x07, 0x2e};
 
-const char16 BrowserAccessibilityWin::kEmbeddedCharacter[] = L"\xfffc";
+const base::char16 BrowserAccessibilityWin::kEmbeddedCharacter[] = L"\xfffc";
 
 // static
 LONG BrowserAccessibilityWin::next_unique_id_win_ =
diff --git a/content/browser/accessibility/browser_accessibility_win.h b/content/browser/accessibility/browser_accessibility_win.h
index 69d6efb..c2a6b7a 100644
--- a/content/browser/accessibility/browser_accessibility_win.h
+++ b/content/browser/accessibility/browser_accessibility_win.h
@@ -82,7 +82,7 @@ BrowserAccessibilityWin
   // Represents a non-static text node in IAccessibleHypertext. This character
   // is embedded in the response to IAccessibleText::get_text, indicating the
   // position where a non-static text child object appears.
-  CONTENT_EXPORT static const char16 kEmbeddedCharacter[];
+  CONTENT_EXPORT static const base::char16 kEmbeddedCharacter[];
 
   // Mappings from roles and states to human readable strings. Initialize
   // with |InitializeStringMaps|.
diff --git a/content/browser/dom_storage/dom_storage_database.cc b/content/browser/dom_storage/dom_storage_database.cc
index 690d02a..155f1c6 100644
--- a/content/browser/dom_storage/dom_storage_database.cc
+++ b/content/browser/dom_storage/dom_storage_database.cc
@@ -107,7 +107,7 @@ bool DOMStorageDatabase::CommitChanges(bool clear_all_first,
           "INSERT INTO ItemTable VALUES (?,?)"));
       statement.BindString16(0, key);
       statement.BindBlob(1, value.string().data(),
-                         value.string().length() * sizeof(char16));
+                         value.string().length() * sizeof(base::char16));
       known_to_be_empty_ = false;
       did_insert = true;
     }
diff --git a/content/browser/dom_storage/session_storage_database.cc b/content/browser/dom_storage/session_storage_database.cc
index 8dc8b91..30d3d86 100644
--- a/content/browser/dom_storage/session_storage_database.cc
+++ b/content/browser/dom_storage/session_storage_database.cc
@@ -578,9 +578,9 @@ bool SessionStorageDatabase::ReadMap(const std::string& map_id,
     } else {
       // Convert the raw data stored in std::string (it->value()) to raw data
       // stored in base::string16.
-      size_t len = it->value().size() / sizeof(char16);
-      const char16* data_ptr =
-          reinterpret_cast<const char16*>(it->value().data());
+      size_t len = it->value().size() / sizeof(base::char16);
+      const base::char16* data_ptr =
+          reinterpret_cast<const base::char16*>(it->value().data());
       (*result)[key16] =
           base::NullableString16(base::string16(data_ptr, len), false);
     }
diff --git a/content/browser/dom_storage/session_storage_database_unittest.cc b/content/browser/dom_storage/session_storage_database_unittest.cc
index 414fbe6..71c8063 100644
--- a/content/browser/dom_storage/session_storage_database_unittest.cc
+++ b/content/browser/dom_storage/session_storage_database_unittest.cc
@@ -303,9 +303,10 @@ void SessionStorageDatabaseTest::DumpData() const {
     if (IsMapValueKey(it->key().ToString(), &dummy_map_id)) {
       // Convert the value back to base::string16.
       base::string16 value;
-      size_t len = it->value().size() / sizeof(char16);
+      size_t len = it->value().size() / sizeof(base::char16);
       value.resize(len);
-      value.assign(reinterpret_cast<const char16*>(it->value().data()), len);
+      value.assign(
+          reinterpret_cast<const base::char16*>(it->value().data()), len);
       LOG(WARNING) << it->key().ToString() << ": " << value;
     } else {
       LOG(WARNING) << it->key().ToString() << ": " << it->value().ToString();
@@ -699,7 +700,7 @@ TEST_F(SessionStorageDatabaseTest, WriteRawBytes) {
   unsigned char raw_data[10] = {255, 0, 0, 0, 1, 2, 3, 4, 5, 0};
   DOMStorageValuesMap changes;
   base::string16 string_with_raw_data;
-  string_with_raw_data.assign(reinterpret_cast<char16*>(raw_data), 5);
+  string_with_raw_data.assign(reinterpret_cast<base::char16*>(raw_data), 5);
   changes[kKey1] = base::NullableString16(string_with_raw_data, false);
   EXPECT_TRUE(db_->CommitAreaChanges(kNamespace1, kOrigin1, false, changes));
   CheckDatabaseConsistency();
diff --git a/content/browser/download/drag_download_util.cc b/content/browser/download/drag_download_util.cc
index 7a22662..5ab1f2a 100644
--- a/content/browser/download/drag_download_util.cc
+++ b/content/browser/download/drag_download_util.cc
@@ -27,7 +27,7 @@ bool ParseDownloadMetadata(const base::string16& metadata,
                            base::string16* mime_type,
                            base::FilePath* file_name,
                            GURL* url) {
-  const char16 separator = L':';
+  const base::char16 separator = L':';
 
   size_t mime_type_end_pos = metadata.find(separator);
   if (mime_type_end_pos == base::string16::npos)
diff --git a/content/browser/geolocation/wifi_data_provider_win.cc b/content/browser/geolocation/wifi_data_provider_win.cc
index a4e6e74..d5149cc 100644
--- a/content/browser/geolocation/wifi_data_provider_win.cc
+++ b/content/browser/geolocation/wifi_data_provider_win.cc
@@ -617,7 +617,7 @@ bool GetSystemDirectory(base::string16* path) {
   if (buffer_size == 0) {
     return false;
   }
-  scoped_ptr<char16[]> buffer(new char16[buffer_size]);
+  scoped_ptr<base::char16[]> buffer(new base::char16[buffer_size]);
 
   // Return value excludes terminating NULL.
   int characters_written = ::GetSystemDirectory(buffer.get(), buffer_size);
diff --git a/content/browser/indexed_db/indexed_db_leveldb_coding.cc b/content/browser/indexed_db/indexed_db_leveldb_coding.cc
index 01c27d1..8a6be42 100644
--- a/content/browser/indexed_db/indexed_db_leveldb_coding.cc
+++ b/content/browser/indexed_db/indexed_db_leveldb_coding.cc
@@ -263,10 +263,11 @@ void EncodeString(const base::string16& value, std::string* into) {
   // Backing store is UTF-16BE, convert from host endianness.
   size_t length = value.length();
   size_t current = into->size();
-  into->resize(into->size() + length * sizeof(char16));
+  into->resize(into->size() + length * sizeof(base::char16));
 
-  const char16* src = value.c_str();
-  char16* dst = reinterpret_cast<char16*>(&*into->begin() + current);
+  const base::char16* src = value.c_str();
+  base::char16* dst =
+      reinterpret_cast<base::char16*>(&*into->begin() + current);
   for (unsigned i = 0; i < length; ++i)
     *dst++ = htons(*src++);
 }
@@ -428,16 +429,17 @@ bool DecodeString(StringPiece* slice, base::string16* value) {
   }
 
   // Backing store is UTF-16BE, convert to host endianness.
-  DCHECK(!(slice->size() % sizeof(char16)));
-  size_t length = slice->size() / sizeof(char16);
+  DCHECK(!(slice->size() % sizeof(base::char16)));
+  size_t length = slice->size() / sizeof(base::char16);
   base::string16 decoded;
   decoded.reserve(length);
-  const char16* encoded = reinterpret_cast<const char16*>(slice->begin());
+  const base::char16* encoded =
+      reinterpret_cast<const base::char16*>(slice->begin());
   for (unsigned i = 0; i < length; ++i)
     decoded.push_back(ntohs(*encoded++));
 
   *value = decoded;
-  slice->remove_prefix(length * sizeof(char16));
+  slice->remove_prefix(length * sizeof(base::char16));
   return true;
 }
 
@@ -448,7 +450,7 @@ bool DecodeStringWithLength(StringPiece* slice, base::string16* value) {
   int64 length = 0;
   if (!DecodeVarInt(slice, &length) || length < 0)
     return false;
-  size_t bytes = length * sizeof(char16);
+  size_t bytes = length * sizeof(base::char16);
   if (slice->size() < bytes)
     return false;
 
@@ -628,9 +630,9 @@ bool ConsumeEncodedIDBKey(StringPiece* slice) {
       int64 length = 0;
       if (!DecodeVarInt(slice, &length) || length < 0)
         return false;
-      if (slice->size() < static_cast<size_t>(length) * sizeof(char16))
+      if (slice->size() < static_cast<size_t>(length) * sizeof(base::char16))
         return false;
-      slice->remove_prefix(length * sizeof(char16));
+      slice->remove_prefix(length * sizeof(base::char16));
       return true;
     }
     case kIndexedDBKeyDateTypeByte:
@@ -690,19 +692,19 @@ int CompareEncodedStringsWithLength(StringPiece* slice1,
     *ok = false;
     return 0;
   }
-  DCHECK_GE(slice1->size(), len1 * sizeof(char16));
-  DCHECK_GE(slice2->size(), len2 * sizeof(char16));
-  if (slice1->size() < len1 * sizeof(char16) ||
-      slice2->size() < len2 * sizeof(char16)) {
+  DCHECK_GE(slice1->size(), len1 * sizeof(base::char16));
+  DCHECK_GE(slice2->size(), len2 * sizeof(base::char16));
+  if (slice1->size() < len1 * sizeof(base::char16) ||
+      slice2->size() < len2 * sizeof(base::char16)) {
     *ok = false;
     return 0;
   }
 
   // Extract the string data, and advance the passed slices.
-  StringPiece string1(slice1->begin(), len1 * sizeof(char16));
-  StringPiece string2(slice2->begin(), len2 * sizeof(char16));
-  slice1->remove_prefix(len1 * sizeof(char16));
-  slice2->remove_prefix(len2 * sizeof(char16));
+  StringPiece string1(slice1->begin(), len1 * sizeof(base::char16));
+  StringPiece string2(slice2->begin(), len2 * sizeof(base::char16));
+  slice1->remove_prefix(len1 * sizeof(base::char16));
+  slice2->remove_prefix(len2 * sizeof(base::char16));
 
   *ok = true;
   // Strings are UTF-16BE encoded, so a simple memcmp is sufficient.
diff --git a/content/browser/indexed_db/indexed_db_leveldb_coding_unittest.cc b/content/browser/indexed_db/indexed_db_leveldb_coding_unittest.cc
index 97128ec..07bf2b1 100644
--- a/content/browser/indexed_db/indexed_db_leveldb_coding_unittest.cc
+++ b/content/browser/indexed_db/indexed_db_leveldb_coding_unittest.cc
@@ -317,8 +317,8 @@ static std::string WrappedEncodeString(base::string16 value) {
 }
 
 TEST(IndexedDBLevelDBCodingTest, EncodeString) {
-  const char16 test_string_a[] = {'f', 'o', 'o', '\0'};
-  const char16 test_string_b[] = {0xdead, 0xbeef, '\0'};
+  const base::char16 test_string_a[] = {'f', 'o', 'o', '\0'};
+  const base::char16 test_string_b[] = {0xdead, 0xbeef, '\0'};
 
   EXPECT_EQ(static_cast<size_t>(0),
             WrappedEncodeString(ASCIIToUTF16("")).size());
@@ -333,8 +333,8 @@ TEST(IndexedDBLevelDBCodingTest, EncodeString) {
 }
 
 TEST(IndexedDBLevelDBCodingTest, DecodeString) {
-  const char16 test_string_a[] = {'f', 'o', 'o', '\0'};
-  const char16 test_string_b[] = {0xdead, 0xbeef, '\0'};
+  const base::char16 test_string_a[] = {'f', 'o', 'o', '\0'};
+  const base::char16 test_string_b[] = {0xdead, 0xbeef, '\0'};
 
   std::vector<base::string16> test_cases;
   test_cases.push_back(base::string16());
@@ -373,8 +373,8 @@ static std::string WrappedEncodeStringWithLength(base::string16 value) {
 }
 
 TEST(IndexedDBLevelDBCodingTest, EncodeStringWithLength) {
-  const char16 test_string_a[] = {'f', 'o', 'o', '\0'};
-  const char16 test_string_b[] = {0xdead, 0xbeef, '\0'};
+  const base::char16 test_string_a[] = {'f', 'o', 'o', '\0'};
+  const base::char16 test_string_b[] = {0xdead, 0xbeef, '\0'};
 
   EXPECT_EQ(static_cast<size_t>(1),
             WrappedEncodeStringWithLength(base::string16()).size());
@@ -389,11 +389,11 @@ TEST(IndexedDBLevelDBCodingTest, EncodeStringWithLength) {
 }
 
 TEST(IndexedDBLevelDBCodingTest, DecodeStringWithLength) {
-  const char16 test_string_a[] = {'f', 'o', 'o', '\0'};
-  const char16 test_string_b[] = {0xdead, 0xbeef, '\0'};
+  const base::char16 test_string_a[] = {'f', 'o', 'o', '\0'};
+  const base::char16 test_string_b[] = {0xdead, 0xbeef, '\0'};
 
   const int kLongStringLen = 1234;
-  char16 long_string[kLongStringLen + 1];
+  base::char16 long_string[kLongStringLen + 1];
   for (int i = 0; i < kLongStringLen; ++i)
     long_string[i] = i;
   long_string[kLongStringLen] = 0;
@@ -445,12 +445,12 @@ static int CompareStrings(const std::string& p, const std::string& q) {
 }
 
 TEST(IndexedDBLevelDBCodingTest, CompareEncodedStringsWithLength) {
-  const char16 test_string_a[] = {0x1000, 0x1000, '\0'};
-  const char16 test_string_b[] = {0x1000, 0x1000, 0x1000, '\0'};
-  const char16 test_string_c[] = {0x1000, 0x1000, 0x1001, '\0'};
-  const char16 test_string_d[] = {0x1001, 0x1000, 0x1000, '\0'};
-  const char16 test_string_e[] = {0xd834, 0xdd1e, '\0'};
-  const char16 test_string_f[] = {0xfffd, '\0'};
+  const base::char16 test_string_a[] = {0x1000, 0x1000, '\0'};
+  const base::char16 test_string_b[] = {0x1000, 0x1000, 0x1000, '\0'};
+  const base::char16 test_string_c[] = {0x1000, 0x1000, 0x1001, '\0'};
+  const base::char16 test_string_d[] = {0x1001, 0x1000, 0x1000, '\0'};
+  const base::char16 test_string_e[] = {0xd834, 0xdd1e, '\0'};
+  const base::char16 test_string_f[] = {0xfffd, '\0'};
 
   std::vector<base::string16> test_cases;
   test_cases.push_back(ASCIIToUTF16(""));
diff --git a/content/browser/renderer_host/render_widget_host_view_aura.cc b/content/browser/renderer_host/render_widget_host_view_aura.cc
index 0c14ea8..1d251a8 100644
--- a/content/browser/renderer_host/render_widget_host_view_aura.cc
+++ b/content/browser/renderer_host/render_widget_host_view_aura.cc
@@ -2258,7 +2258,7 @@ void RenderWidgetHostViewAura::InsertText(const base::string16& text) {
   has_composition_text_ = false;
 }
 
-void RenderWidgetHostViewAura::InsertChar(char16 ch, int flags) {
+void RenderWidgetHostViewAura::InsertChar(base::char16 ch, int flags) {
   if (popup_child_host_view_ && popup_child_host_view_->NeedsInputGrab()) {
     popup_child_host_view_->InsertChar(ch, flags);
     return;
diff --git a/content/browser/renderer_host/render_widget_host_view_aura.h b/content/browser/renderer_host/render_widget_host_view_aura.h
index ab8fcf1..1bff36e 100644
--- a/content/browser/renderer_host/render_widget_host_view_aura.h
+++ b/content/browser/renderer_host/render_widget_host_view_aura.h
@@ -260,7 +260,7 @@ class CONTENT_EXPORT RenderWidgetHostViewAura
   virtual void ConfirmCompositionText() OVERRIDE;
   virtual void ClearCompositionText() OVERRIDE;
   virtual void InsertText(const base::string16& text) OVERRIDE;
-  virtual void InsertChar(char16 ch, int flags) OVERRIDE;
+  virtual void InsertChar(base::char16 ch, int flags) OVERRIDE;
   virtual gfx::NativeWindow GetAttachedWindow() const OVERRIDE;
   virtual ui::TextInputType GetTextInputType() const OVERRIDE;
   virtual ui::TextInputMode GetTextInputMode() const OVERRIDE;
diff --git a/content/browser/renderer_host/render_widget_host_view_win.cc b/content/browser/renderer_host/render_widget_host_view_win.cc
index 7639af2..49c4dbd 100644
--- a/content/browser/renderer_host/render_widget_host_view_win.cc
+++ b/content/browser/renderer_host/render_widget_host_view_win.cc
@@ -1030,7 +1030,7 @@ void RenderWidgetHostViewWin::InsertText(const base::string16& text) {
                                                false);
 }
 
-void RenderWidgetHostViewWin::InsertChar(char16 ch, int flags) {
+void RenderWidgetHostViewWin::InsertChar(base::char16 ch, int flags) {
   if (!base::win::IsTSFAwareRequired()) {
     NOTREACHED();
     return;
diff --git a/content/browser/renderer_host/render_widget_host_view_win.h b/content/browser/renderer_host/render_widget_host_view_win.h
index 4e8717a..69a6bc2 100644
--- a/content/browser/renderer_host/render_widget_host_view_win.h
+++ b/content/browser/renderer_host/render_widget_host_view_win.h
@@ -271,7 +271,7 @@ class RenderWidgetHostViewWin
   virtual void ConfirmCompositionText() OVERRIDE;
   virtual void ClearCompositionText() OVERRIDE;
   virtual void InsertText(const base::string16& text) OVERRIDE;
-  virtual void InsertChar(char16 ch, int flags) OVERRIDE;
+  virtual void InsertChar(base::char16 ch, int flags) OVERRIDE;
   virtual gfx::NativeWindow GetAttachedWindow() const OVERRIDE;
   virtual ui::TextInputType GetTextInputType() const OVERRIDE;
   virtual ui::TextInputMode GetTextInputMode() const OVERRIDE;
diff --git a/content/browser/webui/web_ui_impl.cc b/content/browser/webui/web_ui_impl.cc
index 0c54523..a4c996c 100644
--- a/content/browser/webui/web_ui_impl.cc
+++ b/content/browser/webui/web_ui_impl.cc
@@ -34,13 +34,13 @@ base::string16 WebUI::GetJavascriptCall(
   std::string json;
   for (size_t i = 0; i < arg_list.size(); ++i) {
     if (i > 0)
-      parameters += char16(',');
+      parameters += base::char16(',');
 
     base::JSONWriter::Write(arg_list[i], &json);
     parameters += base::UTF8ToUTF16(json);
   }
   return base::ASCIIToUTF16(function_name) +
-      char16('(') + parameters + char16(')') + char16(';');
+      base::char16('(') + parameters + base::char16(')') + base::char16(';');
 }
 
 WebUIImpl::WebUIImpl(WebContents* contents)
diff --git a/content/common/android/address_parser.cc b/content/common/android/address_parser.cc
index 15874fd3..cc47bef 100644
--- a/content/common/android/address_parser.cc
+++ b/content/common/android/address_parser.cc
@@ -32,7 +32,7 @@ const size_t kMaxAddressNameWordLength = 25;
 const size_t kMaxLocationNameDistance = 4;
 
 // Additional characters used as new line delimiters.
-const char16 kNewlineDelimiters[] = {
+const base::char16 kNewlineDelimiters[] = {
   '\n',
   ',',
   '*',
diff --git a/content/common/android/address_parser_internal.cc b/content/common/android/address_parser_internal.cc
index fe14d3b..b1a440d 100644
--- a/content/common/android/address_parser_internal.cc
+++ b/content/common/android/address_parser_internal.cc
@@ -20,14 +20,14 @@ const size_t kZipPlus4Digits = 9;
 // Maximum number of digits of a house number, including possible hyphens.
 const size_t kMaxHouseDigits = 5;
 
-char16 SafePreviousChar(const base::string16::const_iterator& it,
+base::char16 SafePreviousChar(const base::string16::const_iterator& it,
     const base::string16::const_iterator& begin) {
   if (it == begin)
     return ' ';
   return *(it - 1);
 }
 
-char16 SafeNextChar(const base::string16::const_iterator& it,
+base::char16 SafeNextChar(const base::string16::const_iterator& it,
     const base::string16::const_iterator& end) {
   if (it == end)
     return ' ';
@@ -73,11 +73,11 @@ Word::Word(const base::string16::const_iterator& begin,
   DCHECK(begin <= end);
 }
 
-bool HouseNumberParser::IsPreDelimiter(char16 character) {
+bool HouseNumberParser::IsPreDelimiter(base::char16 character) {
   return character == ':' || IsPostDelimiter(character);
 }
 
-bool HouseNumberParser::IsPostDelimiter(char16 character) {
+bool HouseNumberParser::IsPostDelimiter(base::char16 character) {
   return IsWhitespace(character) || strchr(",\"'", character);
 }
 
@@ -161,10 +161,10 @@ bool HouseNumberParser::Parse(
       // There should be more than 1 character because of result_chars.
       DCHECK_GT(result_chars_, 0U);
       DCHECK(it_ != begin_);
-      char16 previous = SafePreviousChar(it_, begin_);
+      base::char16 previous = SafePreviousChar(it_, begin_);
       if (IsAsciiDigit(previous)) {
         // Check cases like '12A'.
-        char16 next = SafeNextChar(it_, end_);
+        base::char16 next = SafeNextChar(it_, end_);
         if (IsPostDelimiter(next)) {
           AcceptChars(1);
           continue;
@@ -172,9 +172,9 @@ bool HouseNumberParser::Parse(
 
         // Handle cases like 12a, 1st, 2nd, 3rd, 7th.
         if (IsAsciiAlpha(next)) {
-          char16 last_digit = previous;
-          char16 first_letter = base::ToLowerASCII(*it_);
-          char16 second_letter = base::ToLowerASCII(next);
+          base::char16 last_digit = previous;
+          base::char16 first_letter = base::ToLowerASCII(*it_);
+          base::char16 second_letter = base::ToLowerASCII(next);
           bool is_teen = SafePreviousChar(it_ - 1, begin_) == '1' &&
               num_digits_ == 2;
 
@@ -348,7 +348,7 @@ bool FindStateStartingInWord(WordList* words,
     return false;
 
   // No state names start with x, y, z.
-  char16 first_letter = base::ToLowerASCII(*first_word.begin);
+  base::char16 first_letter = base::ToLowerASCII(*first_word.begin);
   if (first_letter > 'w')
     return false;
 
@@ -357,7 +357,7 @@ bool FindStateStartingInWord(WordList* words,
 
   // Look for two-letter state names.
   if (length == 2 && IsAsciiAlpha(*(first_word.begin + 1))) {
-    char16 second_letter = base::ToLowerASCII(*(first_word.begin + 1));
+    base::char16 second_letter = base::ToLowerASCII(*(first_word.begin + 1));
     DCHECK(second_letter >= 'a');
 
     int second_index = second_letter - 'a';
@@ -596,7 +596,7 @@ bool IsValidLocationName(const Word& word) {
     return false;
 
   // No location names start with y, z.
-  char16 first_letter = base::ToLowerASCII(*word.begin);
+  base::char16 first_letter = base::ToLowerASCII(*word.begin);
   if (first_letter > 'x')
     return false;
 
diff --git a/content/common/android/address_parser_internal.h b/content/common/android/address_parser_internal.h
index 74af6c3..2c9d19c 100644
--- a/content/common/android/address_parser_internal.h
+++ b/content/common/android/address_parser_internal.h
@@ -37,8 +37,8 @@ class CONTENT_EXPORT HouseNumberParser {
              Word* word);
 
  private:
-  static inline bool IsPreDelimiter(char16 character);
-  static inline bool IsPostDelimiter(char16 character);
+  static inline bool IsPreDelimiter(base::char16 character);
+  static inline bool IsPostDelimiter(base::char16 character);
   inline void RestartOnNextDelimiter();
 
   inline bool CheckFinished(Word* word) const;
diff --git a/content/common/dom_storage/dom_storage_map.cc b/content/common/dom_storage/dom_storage_map.cc
index 4fe2c3c..de33a52 100644
--- a/content/common/dom_storage/dom_storage_map.cc
+++ b/content/common/dom_storage/dom_storage_map.cc
@@ -11,7 +11,7 @@ namespace content {
 namespace {
 
 size_t size_of_item(const base::string16& key, const base::string16& value) {
-  return (key.length() + value.length()) * sizeof(char16);
+  return (key.length() + value.length()) * sizeof(base::char16);
 }
 
 size_t CountBytes(const DOMStorageValuesMap& values) {
diff --git a/content/common/dom_storage/dom_storage_map_unittest.cc b/content/common/dom_storage/dom_storage_map_unittest.cc
index 641b6b26..31283fd 100644
--- a/content/common/dom_storage/dom_storage_map_unittest.cc
+++ b/content/common/dom_storage/dom_storage_map_unittest.cc
@@ -13,14 +13,14 @@ namespace content {
 TEST(DOMStorageMapTest, DOMStorageMapBasics) {
   const base::string16 kKey(ASCIIToUTF16("key"));
   const base::string16 kValue(ASCIIToUTF16("value"));
-  const size_t kValueBytes = kValue.size() * sizeof(char16);
+  const size_t kValueBytes = kValue.size() * sizeof(base::char16);
   const size_t kItemBytes =
-      (kKey.size() + kValue.size()) * sizeof(char16);
+      (kKey.size() + kValue.size()) * sizeof(base::char16);
   const base::string16 kKey2(ASCIIToUTF16("key2"));
-  const size_t kKey2Bytes = kKey2.size() * sizeof(char16);
+  const size_t kKey2Bytes = kKey2.size() * sizeof(base::char16);
   const base::string16 kValue2(ASCIIToUTF16("value2"));
   const size_t kItem2Bytes =
-      (kKey2.size() + kValue2.size()) * sizeof(char16);
+      (kKey2.size() + kValue2.size()) * sizeof(base::char16);
   const size_t kQuota = 1024;  // 1K quota for this test.
 
   scoped_refptr<DOMStorageMap> map(new DOMStorageMap(kQuota));
diff --git a/content/common/indexed_db/indexed_db_key_unittest.cc b/content/common/indexed_db/indexed_db_key_unittest.cc
index ca52cc4..b7eb11d 100644
--- a/content/common/indexed_db/indexed_db_key_unittest.cc
+++ b/content/common/indexed_db/indexed_db_key_unittest.cc
@@ -32,9 +32,9 @@ TEST(IndexedDBKeyTest, KeySizeEstimates) {
   keys.push_back(IndexedDBKey(date, blink::WebIDBKeyTypeDate));
   estimates.push_back(static_cast<size_t>(24));  // Overhead + sizeof(double).
 
-  const base::string16 string(1024, static_cast<char16>('X'));
+  const base::string16 string(1024, static_cast<base::char16>('X'));
   keys.push_back(IndexedDBKey(string));
-  // Overhead + string length * sizeof(char16).
+  // Overhead + string length * sizeof(base::char16).
   estimates.push_back(static_cast<size_t>(2064));
 
   const size_t array_size = 1024;
diff --git a/content/common/page_state_serialization.cc b/content/common/page_state_serialization.cc
index 4fba507..1a7db619 100644
--- a/content/common/page_state_serialization.cc
+++ b/content/common/page_state_serialization.cc
@@ -311,8 +311,8 @@ void WriteString(const base::NullableString16& str, SerializeObject* obj) {
   if (str.is_null()) {
     obj->pickle.WriteInt(-1);
   } else {
-    const char16* data = str.string().data();
-    size_t length_in_bytes = str.string().length() * sizeof(char16);
+    const base::char16* data = str.string().data();
+    size_t length_in_bytes = str.string().length() * sizeof(base::char16);
 
     CHECK_LT(length_in_bytes,
              static_cast<size_t>(std::numeric_limits<int>::max()));
@@ -323,7 +323,7 @@ void WriteString(const base::NullableString16& str, SerializeObject* obj) {
 
 // This reads a serialized NullableString16 from obj. If a string can't be
 // read, NULL is returned.
-const char16* ReadStringNoCopy(SerializeObject* obj, int* num_chars) {
+const base::char16* ReadStringNoCopy(SerializeObject* obj, int* num_chars) {
   int length_in_bytes;
   if (!obj->pickle.ReadInt(&obj->iter, &length_in_bytes)) {
     obj->parse_error = true;
@@ -340,20 +340,20 @@ const char16* ReadStringNoCopy(SerializeObject* obj, int* num_chars) {
   }
 
   if (num_chars)
-    *num_chars = length_in_bytes / sizeof(char16);
-  return reinterpret_cast<const char16*>(data);
+    *num_chars = length_in_bytes / sizeof(base::char16);
+  return reinterpret_cast<const base::char16*>(data);
 }
 
 base::NullableString16 ReadString(SerializeObject* obj) {
   int num_chars;
-  const char16* chars = ReadStringNoCopy(obj, &num_chars);
+  const base::char16* chars = ReadStringNoCopy(obj, &num_chars);
   return chars ?
       base::NullableString16(base::string16(chars, num_chars), false) :
       base::NullableString16();
 }
 
 void ConsumeString(SerializeObject* obj) {
-  const char16* unused ALLOW_UNUSED = ReadStringNoCopy(obj, NULL);
+  const base::char16* unused ALLOW_UNUSED = ReadStringNoCopy(obj, NULL);
 }
 
 template <typename T>
diff --git a/content/common/plugin_constants_win.cc b/content/common/plugin_constants_win.cc
index e87a50e..edaeffd 100644
--- a/content/common/plugin_constants_win.cc
+++ b/content/common/plugin_constants_win.cc
@@ -6,25 +6,26 @@
 
 namespace content {
 
-const char16 kNativeWindowClassName[] = L"NativeWindowClass";
-const char16 kWrapperNativeWindowClassName[] = L"WrapperNativeWindowClass";
-const char16 kPluginNameAtomProperty[] = L"PluginNameAtom";
-const char16 kPluginVersionAtomProperty[] = L"PluginVersionAtom";
-const char16 kDummyActivationWindowName[] = L"DummyWindowForActivation";
-const char16 kPaintMessageName[] = L"Chrome_CustomPaintil";
-const char16 kRegistryMozillaPlugins[] = L"SOFTWARE\\MozillaPlugins";
-const char16 kMozillaActiveXPlugin[] = L"npmozax.dll";
-const char16 kNewWMPPlugin[] = L"np-mswmp.dll";
-const char16 kOldWMPPlugin[] = L"npdsplay.dll";
-const char16 kYahooApplicationStatePlugin[] = L"npystate.dll";
-const char16 kWanWangProtocolHandlerPlugin[] = L"npww.dll";
-const char16 kFlashPlugin[] = L"npswf32.dll";
-const char16 kAcrobatReaderPlugin[] = L"nppdf32.dll";
-const char16 kRealPlayerPlugin[] = L"nppl3260.dll";
-const char16 kSilverlightPlugin[] = L"npctrl.dll";
-const char16 kJavaPlugin1[] = L"npjp2.dll";
-const char16 kJavaPlugin2[] = L"npdeploytk.dll";
+const base::char16 kNativeWindowClassName[] = L"NativeWindowClass";
+const base::char16 kWrapperNativeWindowClassName[] =
+    L"WrapperNativeWindowClass";
+const base::char16 kPluginNameAtomProperty[] = L"PluginNameAtom";
+const base::char16 kPluginVersionAtomProperty[] = L"PluginVersionAtom";
+const base::char16 kDummyActivationWindowName[] = L"DummyWindowForActivation";
+const base::char16 kPaintMessageName[] = L"Chrome_CustomPaintil";
+const base::char16 kRegistryMozillaPlugins[] = L"SOFTWARE\\MozillaPlugins";
+const base::char16 kMozillaActiveXPlugin[] = L"npmozax.dll";
+const base::char16 kNewWMPPlugin[] = L"np-mswmp.dll";
+const base::char16 kOldWMPPlugin[] = L"npdsplay.dll";
+const base::char16 kYahooApplicationStatePlugin[] = L"npystate.dll";
+const base::char16 kWanWangProtocolHandlerPlugin[] = L"npww.dll";
+const base::char16 kFlashPlugin[] = L"npswf32.dll";
+const base::char16 kAcrobatReaderPlugin[] = L"nppdf32.dll";
+const base::char16 kRealPlayerPlugin[] = L"nppl3260.dll";
+const base::char16 kSilverlightPlugin[] = L"npctrl.dll";
+const base::char16 kJavaPlugin1[] = L"npjp2.dll";
+const base::char16 kJavaPlugin2[] = L"npdeploytk.dll";
 const char kGPUPluginMimeType[] = "application/vnd.google.chrome.gpu-plugin";
-const char16 kPluginDummyParentProperty[] = L"NPAPIPluginDummyParent";
+const base::char16 kPluginDummyParentProperty[] = L"NPAPIPluginDummyParent";
 
 }  // namespace content
diff --git a/content/common/plugin_constants_win.h b/content/common/plugin_constants_win.h
index 7d8d224..d796730 100644
--- a/content/common/plugin_constants_win.h
+++ b/content/common/plugin_constants_win.h
@@ -14,39 +14,39 @@
 namespace content {
 
 // The window class name for a plugin window.
-extern const char16 kNativeWindowClassName[];
+extern const base::char16 kNativeWindowClassName[];
 
 // The name of the window class name for the wrapper HWND around the actual
 // plugin window that's used when running in multi-process mode.  This window
 // is created on the browser UI thread.
-extern const char16 kWrapperNativeWindowClassName[];
+extern const base::char16 kWrapperNativeWindowClassName[];
 
-extern const char16 kPluginNameAtomProperty[];
-extern const char16 kPluginVersionAtomProperty[];
-extern const char16 kDummyActivationWindowName[];
+extern const base::char16 kPluginNameAtomProperty[];
+extern const base::char16 kPluginVersionAtomProperty[];
+extern const base::char16 kDummyActivationWindowName[];
 
 // The name of the custom window message that the browser uses to tell the
 // plugin process to paint a window.
-extern const char16 kPaintMessageName[];
+extern const base::char16 kPaintMessageName[];
 
 // The name of the registry key which NPAPI plugins update on installation.
-extern const char16 kRegistryMozillaPlugins[];
-
-extern const char16 kMozillaActiveXPlugin[];
-extern const char16 kNewWMPPlugin[];
-extern const char16 kOldWMPPlugin[];
-extern const char16 kYahooApplicationStatePlugin[];
-extern const char16 kWanWangProtocolHandlerPlugin[];
-extern const char16 kFlashPlugin[];
-extern const char16 kAcrobatReaderPlugin[];
-extern const char16 kRealPlayerPlugin[];
-extern const char16 kSilverlightPlugin[];
-extern const char16 kJavaPlugin1[];
-extern const char16 kJavaPlugin2[];
+extern const base::char16 kRegistryMozillaPlugins[];
+
+extern const base::char16 kMozillaActiveXPlugin[];
+extern const base::char16 kNewWMPPlugin[];
+extern const base::char16 kOldWMPPlugin[];
+extern const base::char16 kYahooApplicationStatePlugin[];
+extern const base::char16 kWanWangProtocolHandlerPlugin[];
+extern const base::char16 kFlashPlugin[];
+extern const base::char16 kAcrobatReaderPlugin[];
+extern const base::char16 kRealPlayerPlugin[];
+extern const base::char16 kSilverlightPlugin[];
+extern const base::char16 kJavaPlugin1[];
+extern const base::char16 kJavaPlugin2[];
 
 extern const char kGPUPluginMimeType[];
 
-extern const char16 kPluginDummyParentProperty[];
+extern const base::char16 kPluginDummyParentProperty[];
 
 }  // namespace content
 
diff --git a/content/common/plugin_list_win.cc b/content/common/plugin_list_win.cc
index 7d9706b..3afe1ab 100644
--- a/content/common/plugin_list_win.cc
+++ b/content/common/plugin_list_win.cc
@@ -25,23 +25,23 @@
 namespace content {
 namespace {
 
-const char16 kRegistryApps[] =
+const base::char16 kRegistryApps[] =
     L"Software\\Microsoft\\Windows\\CurrentVersion\\App Paths";
-const char16 kRegistryFirefox[] = L"firefox.exe";
-const char16 kRegistryAcrobat[] = L"Acrobat.exe";
-const char16 kRegistryAcrobatReader[] = L"AcroRd32.exe";
-const char16 kRegistryWindowsMedia[] = L"wmplayer.exe";
-const char16 kRegistryQuickTime[] = L"QuickTimePlayer.exe";
-const char16 kRegistryPath[] = L"Path";
-const char16 kRegistryFirefoxInstalled[] =
+const base::char16 kRegistryFirefox[] = L"firefox.exe";
+const base::char16 kRegistryAcrobat[] = L"Acrobat.exe";
+const base::char16 kRegistryAcrobatReader[] = L"AcroRd32.exe";
+const base::char16 kRegistryWindowsMedia[] = L"wmplayer.exe";
+const base::char16 kRegistryQuickTime[] = L"QuickTimePlayer.exe";
+const base::char16 kRegistryPath[] = L"Path";
+const base::char16 kRegistryFirefoxInstalled[] =
     L"SOFTWARE\\Mozilla\\Mozilla Firefox";
-const char16 kRegistryJava[] =
+const base::char16 kRegistryJava[] =
     L"Software\\JavaSoft\\Java Runtime Environment";
-const char16 kRegistryBrowserJavaVersion[] = L"BrowserJavaVersion";
-const char16 kRegistryCurrentJavaVersion[] = L"CurrentVersion";
-const char16 kRegistryJavaHome[] = L"JavaHome";
-const char16 kJavaDeploy1[] = L"npdeploytk.dll";
-const char16 kJavaDeploy2[] = L"npdeployjava1.dll";
+const base::char16 kRegistryBrowserJavaVersion[] = L"BrowserJavaVersion";
+const base::char16 kRegistryCurrentJavaVersion[] = L"CurrentVersion";
+const base::char16 kRegistryJavaHome[] = L"JavaHome";
+const base::char16 kJavaDeploy1[] = L"npdeploytk.dll";
+const base::char16 kJavaDeploy2[] = L"npdeployjava1.dll";
 
 base::FilePath AppendPluginsDir(const base::FilePath& path) {
   return path.AppendASCII("plugins");
@@ -68,7 +68,7 @@ void GetExeDirectory(std::set<base::FilePath>* plugin_dirs) {
 }
 
 // Gets the installed path for a registered app.
-bool GetInstalledPath(const char16* app, base::FilePath* out) {
+bool GetInstalledPath(const base::char16* app, base::FilePath* out) {
   base::string16 reg_path(kRegistryApps);
   reg_path.append(L"\\");
   reg_path.append(app);
diff --git a/content/common/sandbox_win.cc b/content/common/sandbox_win.cc
index 7d916ac..6be38a2 100644
--- a/content/common/sandbox_win.cc
+++ b/content/common/sandbox_win.cc
@@ -220,7 +220,7 @@ void AddGenericDllEvictionPolicy(sandbox::TargetPolicy* policy) {
 }
 
 // Returns the object path prepended with the current logon session.
-base::string16 PrependWindowsSessionPath(const char16* object) {
+base::string16 PrependWindowsSessionPath(const base::char16* object) {
   // Cache this because it can't change after process creation.
   static uintptr_t s_session_id = 0;
   if (s_session_id == 0) {
diff --git a/content/renderer/android/address_detector.cc b/content/renderer/android/address_detector.cc
index 6ab267f..0a3d9e6 100644
--- a/content/renderer/android/address_detector.cc
+++ b/content/renderer/android/address_detector.cc
@@ -40,7 +40,7 @@ std::string AddressDetector::GetContentText(const base::string16& text) {
   // Get the address and replace unicode bullets with commas.
   base::string16 address_16 = CollapseWhitespace(text, false);
   std::replace(address_16.begin(), address_16.end(),
-      static_cast<char16>(0x2022), static_cast<char16>(','));
+      static_cast<base::char16>(0x2022), static_cast<base::char16>(','));
   return base::UTF16ToUTF8(address_16);
 }
 
diff --git a/content/renderer/render_view_browsertest.cc b/content/renderer/render_view_browsertest.cc
index 35f3400..1361561 100644
--- a/content/renderer/render_view_browsertest.cc
+++ b/content/renderer/render_view_browsertest.cc
@@ -222,7 +222,7 @@ class RenderViewImplTest : public RenderViewTest {
 
     long c = GetCharacterFromKeyCode(static_cast<ui::KeyboardCode>(key_code),
                                      flags);
-    output->assign(1, static_cast<char16>(c));
+    output->assign(1, static_cast<base::char16>(c));
     return 1;
 #elif defined(USE_OZONE)
     const int flags = ConvertMockKeyboardModifier(modifiers);
@@ -255,7 +255,7 @@ class RenderViewImplTest : public RenderViewTest {
 
     long c = GetCharacterFromKeyCode(static_cast<ui::KeyboardCode>(key_code),
                                      flags);
-    output->assign(1, static_cast<char16>(c));
+    output->assign(1, static_cast<base::char16>(c));
     return 1;
 #elif defined(TOOLKIT_GTK)
     // We ignore |layout|, which means we are only testing the layout of the
@@ -288,7 +288,7 @@ class RenderViewImplTest : public RenderViewTest {
       gdk_event_free(events[i]);
     }
 
-    output->assign(1, static_cast<char16>(unicode_key));
+    output->assign(1, static_cast<base::char16>(unicode_key));
     return 1;
 #else
     NOTIMPLEMENTED();
diff --git a/content/shell/renderer/test_runner/WebTestProxy.cpp b/content/shell/renderer/test_runner/WebTestProxy.cpp
index f6cec53..4b2215a 100644
--- a/content/shell/renderer/test_runner/WebTestProxy.cpp
+++ b/content/shell/renderer/test_runner/WebTestProxy.cpp
@@ -291,7 +291,7 @@ string dumpFrameScrollPosition(WebFrame* frame, bool recursive)
 }
 
 struct ToLower {
-    char16 operator()(char16 c) { return tolower(c); }
+    base::char16 operator()(base::char16 c) { return tolower(c); }
 };
 
 // Returns True if item1 < item2.