Replace string16 with base::string16 in src/webkit

webkit/dom_storage/dom_storage_cached_area.h

Index: webkit/dom_storage/dom_storage_cached_area.h
diff --git a/webkit/dom_storage/dom_storage_cached_area.h b/webkit/dom_storage/dom_storage_cached_area.h
index ae45a9c20bfd045f86e351a54bde0d60fd5d50ab..52c456486d7eef3627a2414c9c3cf8cae449d475 100644
--- a/webkit/dom_storage/dom_storage_cached_area.h
+++ b/webkit/dom_storage/dom_storage_cached_area.h
@@ -9,7 +9,7 @@
 
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
-#include "base/nullable_string16.h"
+#include "base/nullable_base::string16.h"
 #include "googleurl/src/gurl.h"
 #include "webkit/storage/webkit_storage_export.h"
 
@@ -35,10 +35,12 @@ class WEBKIT_STORAGE_EXPORT DomStorageCachedArea :
 
   unsigned GetLength(int connection_id);
   NullableString16 GetKey(int connection_id, unsigned index);
-  NullableString16 GetItem(int connection_id, const string16& key);
-  bool SetItem(int connection_id, const string16& key, const string16& value,
+  NullableString16 GetItem(int connection_id, const base::string16& key);
+  bool SetItem(int connection_id,
+               const base::string16& key,
+               const base::string16& value,
                const GURL& page_url);
-  void RemoveItem(int connection_id, const string16& key,
+  void RemoveItem(int connection_id, const base::string16& key,
                   const GURL& page_url);
   void Clear(int connection_id, const GURL& page_url);
 
@@ -67,16 +69,16 @@ class WEBKIT_STORAGE_EXPORT DomStorageCachedArea :
   // mutation events from other processes from overwriting local
   // changes made after the mutation.
   void OnLoadComplete(bool success);
-  void OnSetItemComplete(const string16& key, bool success);
+  void OnSetItemComplete(const base::string16& key, bool success);
   void OnClearComplete(bool success);
-  void OnRemoveItemComplete(const string16& key, bool success);
+  void OnRemoveItemComplete(const base::string16& key, bool success);
 
-  bool should_ignore_key_mutation(const string16& key) const {
+  bool should_ignore_key_mutation(const base::string16& key) const {
     return ignore_key_mutations_.find(key) != ignore_key_mutations_.end();
   }
 
   bool ignore_all_mutations_;
-  std::map<string16, int> ignore_key_mutations_;
+  std::map<base::string16, int> ignore_key_mutations_;
 
   int64 namespace_id_;
   GURL origin_;