Replace string16 with base::string16 in src/webkit

webkit/database/database_connections_unittest.cc

Index: webkit/database/database_connections_unittest.cc
diff --git a/webkit/database/database_connections_unittest.cc b/webkit/database/database_connections_unittest.cc
index d0deb31d7679124924054bc01b4761f653bd1480..1443f1248e6636d1b2630511e5f97f82c7f24670 100644
--- a/webkit/database/database_connections_unittest.cc
+++ b/webkit/database/database_connections_unittest.cc
@@ -14,7 +14,7 @@ namespace webkit_database {
 namespace {
 
 void RemoveConnectionTask(
-    const string16& origin_id, const string16& database_name,
+    const base::string16& origin_id, const base::string16& database_name,
     scoped_refptr<DatabaseConnectionsWrapper> obj,
     bool* did_task_execute) {
   *did_task_execute = true;
@@ -22,8 +22,8 @@ void RemoveConnectionTask(
 }
 
 void ScheduleRemoveConnectionTask(
-    base::Thread* thread,  const string16& origin_id,
-    const string16& database_name,
+    base::Thread* thread,  const base::string16& origin_id,
+    const base::string16& database_name,
     scoped_refptr<DatabaseConnectionsWrapper> obj,
     bool* did_task_execute) {
   thread->message_loop()->PostTask(
@@ -35,9 +35,9 @@ void ScheduleRemoveConnectionTask(
 }  // anonymous namespace
 
 TEST(DatabaseConnectionsTest, DatabaseConnectionsTest) {
-  const string16 kOriginId(ASCIIToUTF16("origin_id"));
-  const string16 kName(ASCIIToUTF16("database_name"));
-  const string16 kName2(ASCIIToUTF16("database_name2"));
+  const base::string16 kOriginId(ASCIIToUTF16("origin_id"));
+  const base::string16 kName(ASCIIToUTF16("database_name"));
+  const base::string16 kName2(ASCIIToUTF16("database_name2"));
   const int64 kSize = 1000;
 
   DatabaseConnections connections;
@@ -74,7 +74,7 @@ TEST(DatabaseConnectionsTest, DatabaseConnectionsTest) {
   another.AddConnection(kOriginId, kName);
   another.AddConnection(kOriginId, kName2);
 
-  std::vector<std::pair<string16, string16> > closed_dbs;
+  std::vector<std::pair<base::string16, base::string16> > closed_dbs;
   connections.RemoveConnections(another, &closed_dbs);
   EXPECT_EQ(1u, closed_dbs.size());
   EXPECT_EQ(kOriginId, closed_dbs[0].first);
@@ -97,8 +97,8 @@ TEST(DatabaseConnectionsTest, DatabaseConnectionsTest) {
 }
 
 TEST(DatabaseConnectionsTest, DatabaseConnectionsWrapperTest) {
-  const string16 kOriginId(ASCIIToUTF16("origin_id"));
-  const string16 kName(ASCIIToUTF16("database_name"));
+  const base::string16 kOriginId(ASCIIToUTF16("origin_id"));
+  const base::string16 kName(ASCIIToUTF16("database_name"));
 
   MessageLoop message_loop;
   scoped_refptr<DatabaseConnectionsWrapper> obj(