Replace string16 with base::string16 in src/webkit

webkit/database/database_util.h

Index: webkit/database/database_util.h
diff --git a/webkit/database/database_util.h b/webkit/database/database_util.h
index 8b366aabe5facf28d682808794ad4332c6701d56..a5a82d5c655f812ae017130d6d42e0725742fc46 100644
--- a/webkit/database/database_util.h
+++ b/webkit/database/database_util.h
@@ -5,7 +5,7 @@
 #ifndef WEBKIT_DATABASE_DATABASE_UTIL_H_
 #define WEBKIT_DATABASE_DATABASE_UTIL_H_
 
-#include "base/string16.h"
+#include "base/string16.h.h"
 #include "googleurl/src/gurl.h"
 #include "webkit/storage/webkit_storage_export.h"
 
@@ -23,15 +23,16 @@ class WEBKIT_STORAGE_EXPORT DatabaseUtil {
 
   // Extract various information from a database vfs_file_name.  All return
   // parameters are optional.
-  static bool CrackVfsFileName(const string16& vfs_file_name,
-                               string16* origin_identifier,
-                               string16* database_name,
-                               string16* sqlite_suffix);
-  static base::FilePath GetFullFilePathForVfsFile(DatabaseTracker* db_tracker,
-                                                  const string16& vfs_file_name);
-  static string16 GetOriginIdentifier(const GURL& url);
-  static GURL GetOriginFromIdentifier(const string16& origin_identifier);
-  static bool IsValidOriginIdentifier(const string16& origin_identifier);
+  static bool CrackVfsFileName(const base::string16& vfs_file_name,
+                               base::string16* origin_identifier,
+                               base::string16* database_name,
+                               base::string16* sqlite_suffix);
+  static base::FilePath GetFullFilePathForVfsFile(
+      DatabaseTracker* db_tracker,
+      const base::string16& vfs_file_name);
+  static base::string16 GetOriginIdentifier(const GURL& url);
+  static GURL GetOriginFromIdentifier(const base::string16& origin_identifier);
+  static bool IsValidOriginIdentifier(const base::string16& origin_identifier);
 };
 
 }  // namespace webkit_database