| Index: webkit/dom_storage/dom_storage_map.cc
|
| diff --git a/webkit/dom_storage/dom_storage_map.cc b/webkit/dom_storage/dom_storage_map.cc
|
| index 6c086b644839d071fa6b21fc43c13205a165ecc2..fa8eb0945b54c093f68046a3b9e687095afa6b1b 100644
|
| --- a/webkit/dom_storage/dom_storage_map.cc
|
| +++ b/webkit/dom_storage/dom_storage_map.cc
|
| @@ -8,7 +8,7 @@
|
|
|
| namespace {
|
|
|
| -size_t size_of_item(const string16& key, const string16& value) {
|
| +size_t size_of_item(const base::string16& key, const base::string16& value) {
|
| return (key.length() + value.length()) * sizeof(char16);
|
| }
|
|
|
| @@ -54,7 +54,7 @@ NullableString16 DomStorageMap::Key(unsigned index) {
|
| return NullableString16(key_iterator_->first, false);
|
| }
|
|
|
| -NullableString16 DomStorageMap::GetItem(const string16& key) const {
|
| +NullableString16 DomStorageMap::GetItem(const base::string16& key) const {
|
| ValuesMap::const_iterator found = values_.find(key);
|
| if (found == values_.end())
|
| return NullableString16(true);
|
| @@ -62,7 +62,7 @@ NullableString16 DomStorageMap::GetItem(const string16& key) const {
|
| }
|
|
|
| bool DomStorageMap::SetItem(
|
| - const string16& key, const string16& value,
|
| + const base::string16& key, const base::string16& value,
|
| NullableString16* old_value) {
|
| ValuesMap::const_iterator found = values_.find(key);
|
| if (found == values_.end())
|
| @@ -87,8 +87,8 @@ bool DomStorageMap::SetItem(
|
| }
|
|
|
| bool DomStorageMap::RemoveItem(
|
| - const string16& key,
|
| - string16* old_value) {
|
| + const base::string16& key,
|
| + base::string16* old_value) {
|
| ValuesMap::iterator found = values_.find(key);
|
| if (found == values_.end())
|
| return false;
|
|
|