Index: webkit/tools/test_shell/simple_dom_storage_system.cc |
diff --git a/webkit/tools/test_shell/simple_dom_storage_system.cc b/webkit/tools/test_shell/simple_dom_storage_system.cc |
index 7f05b2a6761e225a00bf4f59ae7b506406947329..05eb07ec51504e682532a67c2f0936297bd7be5e 100644 |
--- a/webkit/tools/test_shell/simple_dom_storage_system.cc |
+++ b/webkit/tools/test_shell/simple_dom_storage_system.cc |
@@ -176,7 +176,7 @@ void SimpleDomStorageSystem::AreaImpl::removeItem( |
return; |
base::AutoReset<AreaImpl*> auto_reset(&parent_->area_being_processed_, this); |
- string16 notused; |
+ base::string16 notused; |
Host()->RemoveAreaItem(connection_id_, key, pageUrl, ¬used); |
} |
@@ -222,8 +222,8 @@ WebStorageNamespace* SimpleDomStorageSystem::CreateSessionStorageNamespace() { |
void SimpleDomStorageSystem::OnDomStorageItemSet( |
const dom_storage::DomStorageArea* area, |
- const string16& key, |
- const string16& new_value, |
+ const base::string16& key, |
+ const base::string16& new_value, |
const NullableString16& old_value, |
const GURL& page_url) { |
DispatchDomStorageEvent(area, page_url, |
@@ -234,8 +234,8 @@ void SimpleDomStorageSystem::OnDomStorageItemSet( |
void SimpleDomStorageSystem::OnDomStorageItemRemoved( |
const dom_storage::DomStorageArea* area, |
- const string16& key, |
- const string16& old_value, |
+ const base::string16& key, |
+ const base::string16& old_value, |
const GURL& page_url) { |
DispatchDomStorageEvent(area, page_url, |
NullableString16(key, false), |