Replace string16 with base::string16 in src/webkit

webkit/dom_storage/dom_storage_map.h

Index: webkit/dom_storage/dom_storage_map.h
diff --git a/webkit/dom_storage/dom_storage_map.h b/webkit/dom_storage/dom_storage_map.h
index 3a1d6f8d2b4263371015f48e3cc10d0f30921f02..2042ea0b17bd51b1a9e6f51f6b0848ad62c8ea89 100644
--- a/webkit/dom_storage/dom_storage_map.h
+++ b/webkit/dom_storage/dom_storage_map.h
@@ -8,8 +8,8 @@
 #include <map>
 
 #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 "webkit/dom_storage/dom_storage_types.h"
 #include "webkit/storage/webkit_storage_export.h"
 
@@ -25,10 +25,10 @@ class WEBKIT_STORAGE_EXPORT DomStorageMap
 
   unsigned Length() const;
   NullableString16 Key(unsigned index);
-  NullableString16 GetItem(const string16& key) const;
-  bool SetItem(const string16& key, const string16& value,
+  NullableString16 GetItem(const base::string16& key) const;
+  bool SetItem(const base::string16& key, const base::string16& value,
                NullableString16* old_value);
-  bool RemoveItem(const string16& key, string16* old_value);
+  bool RemoveItem(const base::string16& key, base::string16* old_value);
 
   // Swaps this instances values_ with |map|.
   // Note: to grandfather in pre-existing files that are overbudget,