Replace string16 with base::string16 in src/webkit

webkit/database/database_connections.h

Index: webkit/database/database_connections.h
diff --git a/webkit/database/database_connections.h b/webkit/database/database_connections.h
index f49cb793cf59534646444b04ce76ced9f71a907f..13d37c53db44d12dfdf80a7f3596af5997adcd2e 100644
--- a/webkit/database/database_connections.h
+++ b/webkit/database/database_connections.h
@@ -9,7 +9,7 @@
 #include <vector>
 
 #include "base/memory/ref_counted.h"
-#include "base/string16.h"
+#include "base/string16.h.h"
 #include "base/synchronization/lock.h"
 #include "webkit/storage/webkit_storage_export.h"
 
@@ -25,43 +25,43 @@ class WEBKIT_STORAGE_EXPORT DatabaseConnections {
   ~DatabaseConnections();
 
   bool IsEmpty() const;
-  bool IsDatabaseOpened(const string16& origin_identifier,
-                        const string16& database_name) const;
-  bool IsOriginUsed(const string16& origin_identifier) const;
+  bool IsDatabaseOpened(const base::string16& origin_identifier,
+                        const base::string16& database_name) const;
+  bool IsOriginUsed(const base::string16& origin_identifier) const;
 
   // Returns true if this is the first connection.
-  bool AddConnection(const string16& origin_identifier,
-                     const string16& database_name);
+  bool AddConnection(const base::string16& origin_identifier,
+                     const base::string16& database_name);
 
   // Returns true if the last connection was removed.
-  bool RemoveConnection(const string16& origin_identifier,
-                        const string16& database_name);
+  bool RemoveConnection(const base::string16& origin_identifier,
+                        const base::string16& database_name);
 
   void RemoveAllConnections();
   void RemoveConnections(
       const DatabaseConnections& connections,
-      std::vector<std::pair<string16, string16> >* closed_dbs);
+      std::vector<std::pair<base::string16, base::string16> >* closed_dbs);
 
   // Database sizes can be kept only if IsDatabaseOpened returns true.
-  int64 GetOpenDatabaseSize(const string16& origin_identifier,
-                            const string16& database_name) const;
-  void SetOpenDatabaseSize(const string16& origin_identifier,
-                           const string16& database_name,
+  int64 GetOpenDatabaseSize(const base::string16& origin_identifier,
+                            const base::string16& database_name) const;
+  void SetOpenDatabaseSize(const base::string16& origin_identifier,
+                           const base::string16& database_name,
                            int64 size);
 
   // Returns a list of the connections, <origin_id, name>.
   void ListConnections(
-      std::vector<std::pair<string16, string16> > *list) const;
+      std::vector<std::pair<base::string16, base::string16> > *list) const;
 
  private:
   // Mapping from name to <openCount, size>
-  typedef std::map<string16, std::pair<int, int64> > DBConnections;
-  typedef std::map<string16, DBConnections> OriginConnections;
+  typedef std::map<base::string16, std::pair<int, int64> > DBConnections;
+  typedef std::map<base::string16, DBConnections> OriginConnections;
   mutable OriginConnections connections_;  // mutable for GetOpenDatabaseSize
 
   // Returns true if the last connection was removed.
-  bool RemoveConnectionsHelper(const string16& origin_identifier,
-                               const string16& database_name,
+  bool RemoveConnectionsHelper(const base::string16& origin_identifier,
+                               const base::string16& database_name,
                                int num_connections);
 };
 
@@ -79,10 +79,10 @@ class WEBKIT_STORAGE_EXPORT DatabaseConnectionsWrapper
   bool HasOpenConnections();
 
   // Add and Remove may be called on any thread.
-  void AddOpenConnection(const string16& origin_identifier,
-                         const string16& database_name);
-  void RemoveOpenConnection(const string16& origin_identifier,
-                            const string16& database_name);
+  void AddOpenConnection(const base::string16& origin_identifier,
+                         const base::string16& database_name);
+  void RemoveOpenConnection(const base::string16& origin_identifier,
+                            const base::string16& database_name);
  private:
   ~DatabaseConnectionsWrapper();
   friend class base::RefCountedThreadSafe<DatabaseConnectionsWrapper>;