Replace string16 with base::string16 in src/webkit

webkit/dom_storage/dom_storage_proxy.h

Index: webkit/dom_storage/dom_storage_proxy.h
diff --git a/webkit/dom_storage/dom_storage_proxy.h b/webkit/dom_storage/dom_storage_proxy.h
index 867d3bb45fdb42868047f4d7e5948536e7ea8828..0067f8a01e4cdfd38c9441e79694407a8b33a2fb 100644
--- a/webkit/dom_storage/dom_storage_proxy.h
+++ b/webkit/dom_storage/dom_storage_proxy.h
@@ -7,8 +7,8 @@
 
 #include "base/bind.h"
 #include "base/memory/ref_counted.h"
-#include "base/nullable_string16.h"
-#include "base/string16.h"
+#include "base/nullable_base::string16.h"
+#include "base/string16.h.h"
 #include "googleurl/src/gurl.h"
 #include "webkit/dom_storage/dom_storage_types.h"
 
@@ -22,11 +22,11 @@ class DomStorageProxy : public base::RefCounted<DomStorageProxy> {
   virtual void LoadArea(int connection_id, ValuesMap* values,
                         const CompletionCallback& callback) = 0;
 
-  virtual void SetItem(int connection_id, const string16& key,
-                       const string16& value, const GURL& page_url,
+  virtual void SetItem(int connection_id, const base::string16& key,
+                       const base::string16& value, const GURL& page_url,
                        const CompletionCallback& callback) = 0;
 
-  virtual void RemoveItem(int connection_id, const string16& key,
+  virtual void RemoveItem(int connection_id, const base::string16& key,
                           const GURL& page_url,
                           const CompletionCallback& callback) = 0;