diff options
author | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-25 20:04:53 +0000 |
---|---|---|
committer | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-25 20:04:53 +0000 |
commit | b6775d788c0bcc4bc879731478a2eadc522dc767 (patch) | |
tree | cbe11af8995612881de1dc5d70cf958d4dc3e377 /content/browser | |
parent | 6c3bf032651d5f912775e0c8cd7e962454145ced (diff) | |
download | chromium_src-b6775d788c0bcc4bc879731478a2eadc522dc767.zip chromium_src-b6775d788c0bcc4bc879731478a2eadc522dc767.tar.gz chromium_src-b6775d788c0bcc4bc879731478a2eadc522dc767.tar.bz2 |
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
Diffstat (limited to 'content/browser')
14 files changed, 53 insertions, 50 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) |