Replace string16 with base::string16 in src/webkit

webkit/dom_storage/dom_storage_types.h

Index: webkit/dom_storage/dom_storage_types.h
diff --git a/webkit/dom_storage/dom_storage_types.h b/webkit/dom_storage/dom_storage_types.h
index 180fb8043dfae553d6f2689463a81d1af83bfcfe..2c0e3ef61ce32c18785647fa925aa05b1706a0e7 100644
--- a/webkit/dom_storage/dom_storage_types.h
+++ b/webkit/dom_storage/dom_storage_types.h
@@ -8,8 +8,8 @@
 #include <map>
 
 #include "base/basictypes.h"
-#include "base/nullable_string16.h"
-#include "base/string16.h"
+#include "base/nullable_base::string16.h"
+#include "base/string16.h.h"
 #include "base/time.h"
 #include "googleurl/src/gurl.h"
 #include "webkit/storage/webkit_storage_export.h"
@@ -35,7 +35,7 @@ const int64 kInvalidSessionStorageNamespaceId = kLocalStorageNamespaceId;
 // Value to indicate an area that not be opened.
 const int kInvalidAreaId = -1;
 
-typedef std::map<string16, NullableString16> ValuesMap;
+typedef std::map<base::string16, NullableString16> ValuesMap;
 
 struct WEBKIT_STORAGE_EXPORT LocalStorageUsageInfo {
   GURL origin;