Replace string16 with base::string16 in src/webkit

webkit/tools/test_shell/simple_dom_storage_system.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "webkit/tools/test_shell/simple_dom_storage_system.h"
 
 #include "base/auto_reset.h"
 #include "googleurl/src/gurl.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebStorageArea.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebStorageNamespace.h"
@@ skipping 158 matching lines @@
 
   result = ResultOK;
 }
 
 void SimpleDomStorageSystem::AreaImpl::removeItem(
     const WebString& key, const WebURL& pageUrl) {
   if (!Host())
     return;
 
   base::AutoReset<AreaImpl*> auto_reset(&parent_->area_being_processed_, this);
-  string16 notused;
+  base::string16 notused;
   Host()->RemoveAreaItem(connection_id_, key, pageUrl, &notused);
 }
 
 void SimpleDomStorageSystem::AreaImpl::clear(const WebURL& pageUrl) {
   if (!Host())
     return;
 
   base::AutoReset<AreaImpl*> auto_reset(&parent_->area_being_processed_, this);
   Host()->ClearArea(connection_id_, pageUrl);
 }
@@ skipping 25 matching lines @@
 }
 
 WebStorageNamespace* SimpleDomStorageSystem::CreateSessionStorageNamespace() {
   int id = context_->AllocateSessionId();
   context_->CreateSessionNamespace(id, std::string());
   return new NamespaceImpl(weak_factory_.GetWeakPtr(), id);
 }
 
 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,
                           NullableString16(key, false),
                           NullableString16(new_value, false),
                           old_value);
 }
 
 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),
                           NullableString16(true),
                           NullableString16(old_value, false));
 }
 
 void SimpleDomStorageSystem::OnDomStorageAreaCleared(
     const dom_storage::DomStorageArea* area,
     const GURL& page_url) {
@@ skipping 26 matching lines @@
         key,
         old_value,
         new_value,
         area->origin(),
         page_url,
         session_namespace_for_event_dispatch,
         area_being_processed_,
         true  /* originatedInProcess */);
   }
 }