Replace string16 with base::string16 in src/webkit

webkit/dom_storage/dom_storage_area.h

Index: webkit/dom_storage/dom_storage_area.h
diff --git a/webkit/dom_storage/dom_storage_area.h b/webkit/dom_storage/dom_storage_area.h
index d804b411e537957bd1a386cd6fddd407a59645f2..0d822c8e88b5fb192c3f125408a24707bd6d62b6 100644
--- a/webkit/dom_storage/dom_storage_area.h
+++ b/webkit/dom_storage/dom_storage_area.h
@@ -9,8 +9,8 @@
 #include "base/gtest_prod_util.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
-#include "base/nullable_string16.h"
-#include "base/string16.h"
+#include "base/nullable_base::string16.h"

[jamesr, 2013/03/28 21:03:00]

this also looks wrong

+#include "base/string16.h.h"
 #include "googleurl/src/gurl.h"
 #include "webkit/dom_storage/dom_storage_types.h"
 #include "webkit/storage/webkit_storage_export.h"
@@ -53,10 +53,10 @@ class WEBKIT_STORAGE_EXPORT DomStorageArea
 
   unsigned Length();
   NullableString16 Key(unsigned index);
-  NullableString16 GetItem(const string16& key);
-  bool SetItem(const string16& key, const string16& value,
+  NullableString16 GetItem(const base::string16& key);
+  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);
   bool Clear();
   void FastClear();