Replace string16 with base::string16 in src/webkit

webkit/database/database_tracker_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/file_util.h"
 #include "base/files/file_path.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "base/message_loop_proxy.h"
@@ skipping 21 matching lines @@
         observe_size_changes_(true),
         observe_scheduled_deletions_(true) {
   }
   TestObserver(bool observe_size_changes, bool observe_scheduled_deletions)
       : new_notification_received_(false),
         observe_size_changes_(observe_size_changes),
         observe_scheduled_deletions_(observe_scheduled_deletions) {
   }
 
   virtual ~TestObserver() {}
-  virtual void OnDatabaseSizeChanged(const string16& origin_identifier,
-                                     const string16& database_name,
+  virtual void OnDatabaseSizeChanged(const base::string16& origin_identifier,
+                                     const base::string16& database_name,
                                      int64 database_size) OVERRIDE {
     if (!observe_size_changes_)
       return;
     new_notification_received_ = true;
     origin_identifier_ = origin_identifier;
     database_name_ = database_name;
     database_size_ = database_size;
   }
   virtual void OnDatabaseScheduledForDeletion(
-      const string16& origin_identifier,
-      const string16& database_name) OVERRIDE {
+      const base::string16& origin_identifier,
+      const base::string16& database_name) OVERRIDE {
     if (!observe_scheduled_deletions_)
       return;
     new_notification_received_ = true;
     origin_identifier_ = origin_identifier;
     database_name_ = database_name;
   }
   bool DidReceiveNewNotification() {
     bool temp_new_notification_received = new_notification_received_;
     new_notification_received_ = false;
     return temp_new_notification_received;
   }
-  string16 GetNotificationOriginIdentifier() { return origin_identifier_; }
-  string16 GetNotificationDatabaseName() { return database_name_; }
+  base::string16 GetNotificationOriginIdentifier() {
+    return origin_identifier_;
+  }
+  base::string16 GetNotificationDatabaseName() { return database_name_; }
   int64 GetNotificationDatabaseSize() { return database_size_; }
 
  private:
   bool new_notification_received_;
   bool observe_size_changes_;
   bool observe_scheduled_deletions_;
-  string16 origin_identifier_;
-  string16 database_name_;
+  base::string16 origin_identifier_;
+  base::string16 database_name_;
   int64 database_size_;
 };
 
 void CheckNotificationReceived(TestObserver* observer,
-                               const string16& expected_origin_identifier,
-                               const string16& expected_database_name,
+                               const base::string16& expected_origin_identifier,
+                               const base::string16& expected_database_name,
                                int64 expected_database_size) {
   EXPECT_TRUE(observer->DidReceiveNewNotification());
   EXPECT_EQ(expected_origin_identifier,
             observer->GetNotificationOriginIdentifier());
   EXPECT_EQ(expected_database_name,
             observer->GetNotificationDatabaseName());
   EXPECT_EQ(expected_database_size,
             observer->GetNotificationDatabaseSize());
 }
 
@@ skipping 100 matching lines @@
     ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
     scoped_refptr<quota::MockSpecialStoragePolicy> special_storage_policy =
         new quota::MockSpecialStoragePolicy;
     special_storage_policy->AddProtected(GURL(kOrigin2Url));
     scoped_refptr<DatabaseTracker> tracker(
         new DatabaseTracker(temp_dir.path(), incognito_mode,
                             special_storage_policy, NULL, NULL));
 
     // Create and open three databases.
     int64 database_size = 0;
-    const string16 kOrigin1 =
+    const base::string16 kOrigin1 =
         DatabaseUtil::GetOriginIdentifier(GURL(kOrigin1Url));
-    const string16 kOrigin2 =
+    const base::string16 kOrigin2 =
         DatabaseUtil::GetOriginIdentifier(GURL(kOrigin2Url));
-    const string16 kDB1 = ASCIIToUTF16("db1");
-    const string16 kDB2 = ASCIIToUTF16("db2");
-    const string16 kDB3 = ASCIIToUTF16("db3");
-    const string16 kDescription = ASCIIToUTF16("database_description");
+    const base::string16 kDB1 = ASCIIToUTF16("db1");
+    const base::string16 kDB2 = ASCIIToUTF16("db2");
+    const base::string16 kDB3 = ASCIIToUTF16("db3");
+    const base::string16 kDescription = ASCIIToUTF16("database_description");
 
     tracker->DatabaseOpened(kOrigin1, kDB1, kDescription, 0,
                             &database_size);
     tracker->DatabaseOpened(kOrigin2, kDB2, kDescription, 0,
                             &database_size);
     tracker->DatabaseOpened(kOrigin2, kDB3, kDescription, 0,
                             &database_size);
 
     EXPECT_TRUE(file_util::CreateDirectory(tracker->DatabaseDirectory().Append(
         base::FilePath::FromWStringHack(UTF16ToWide(
@@ skipping 83 matching lines @@
                             special_storage_policy, NULL, NULL));
 
     // Add two observers.
     TestObserver observer1;
     TestObserver observer2;
     tracker->AddObserver(&observer1);
     tracker->AddObserver(&observer2);
 
     // Open three new databases.
     int64 database_size = 0;
-    const string16 kOrigin1 =
+    const base::string16 kOrigin1 =
         DatabaseUtil::GetOriginIdentifier(GURL(kOrigin1Url));
-    const string16 kOrigin2 =
+    const base::string16 kOrigin2 =
         DatabaseUtil::GetOriginIdentifier(GURL(kOrigin2Url));
-    const string16 kDB1 = ASCIIToUTF16("db1");
-    const string16 kDB2 = ASCIIToUTF16("db2");
-    const string16 kDB3 = ASCIIToUTF16("db3");
-    const string16 kDescription = ASCIIToUTF16("database_description");
+    const base::string16 kDB1 = ASCIIToUTF16("db1");
+    const base::string16 kDB2 = ASCIIToUTF16("db2");
+    const base::string16 kDB3 = ASCIIToUTF16("db3");
+    const base::string16 kDescription = ASCIIToUTF16("database_description");
 
     // Get the info for kOrigin1 and kOrigin2
     DatabaseTracker::CachedOriginInfo* origin1_info =
         tracker->GetCachedOriginInfo(kOrigin1);
     DatabaseTracker::CachedOriginInfo* origin2_info =
         tracker->GetCachedOriginInfo(kOrigin1);
     EXPECT_TRUE(origin1_info);
     EXPECT_TRUE(origin2_info);
 
 
@@ skipping 100 matching lines @@
     EXPECT_EQ(size_t(1), origins_info.size());
     EXPECT_EQ(kOrigin2, origins_info[0].GetOrigin());
 
     origin1_info = tracker->GetCachedOriginInfo(kOrigin1);
     EXPECT_TRUE(origin1_info);
     EXPECT_EQ(0, origin1_info->TotalSize());
   }
 
   static void DatabaseTrackerQuotaIntegration() {
     const GURL kOrigin(kOrigin1Url);
-    const string16 kOriginId = DatabaseUtil::GetOriginIdentifier(kOrigin);
-    const string16 kName = ASCIIToUTF16("name");
-    const string16 kDescription = ASCIIToUTF16("description");
+    const base::string16 kOriginId = DatabaseUtil::GetOriginIdentifier(kOrigin);
+    const base::string16 kName = ASCIIToUTF16("name");
+    const base::string16 kDescription = ASCIIToUTF16("description");
 
     base::ScopedTempDir temp_dir;
     ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
 
     // Initialize the tracker with a QuotaManagerProxy
     scoped_refptr<TestQuotaManagerProxy> test_quota_proxy(
         new TestQuotaManagerProxy);
     scoped_refptr<DatabaseTracker> tracker(
         new DatabaseTracker(temp_dir.path(), false /* incognito */,
                             NULL, test_quota_proxy, NULL));
@@ skipping 71 matching lines @@
     tracker->CloseDatabases(crashed_renderer_connections);
     EXPECT_TRUE(test_quota_proxy->WasModificationNotified(kOrigin, 100));
 
     // Cleanup.
     crashed_renderer_connections.RemoveAllConnections();
     test_quota_proxy->SimulateQuotaManagerDestroyed();
   }
 
   static void DatabaseTrackerClearSessionOnlyDatabasesOnExit() {
     int64 database_size = 0;
-    const string16 kOrigin1 =
+    const base::string16 kOrigin1 =
         DatabaseUtil::GetOriginIdentifier(GURL(kOrigin1Url));
-    const string16 kOrigin2 =
+    const base::string16 kOrigin2 =
         DatabaseUtil::GetOriginIdentifier(GURL(kOrigin2Url));
-    const string16 kDB1 = ASCIIToUTF16("db1");
-    const string16 kDB2 = ASCIIToUTF16("db2");
-    const string16 kDescription = ASCIIToUTF16("database_description");
+    const base::string16 kDB1 = ASCIIToUTF16("db1");
+    const base::string16 kDB2 = ASCIIToUTF16("db2");
+    const base::string16 kDescription = ASCIIToUTF16("database_description");
 
     // Initialize the tracker database.
     MessageLoop message_loop;
     base::ScopedTempDir temp_dir;
     ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
     base::FilePath origin1_db_dir;
     base::FilePath origin2_db_dir;
     {
       scoped_refptr<quota::MockSpecialStoragePolicy> special_storage_policy =
           new quota::MockSpecialStoragePolicy;
@@ skipping 51 matching lines @@
     EXPECT_EQ(base::FilePath(), tracker->GetFullDBFilePath(kOrigin2, kDB2));
 
     // The origin directory of kOrigin1 remains, but the origin directory of
     // kOrigin2 is deleted.
     EXPECT_TRUE(file_util::PathExists(origin1_db_dir));
     EXPECT_FALSE(file_util::PathExists(origin2_db_dir));
   }
 
   static void DatabaseTrackerSetForceKeepSessionState() {
     int64 database_size = 0;
-    const string16 kOrigin1 =
+    const base::string16 kOrigin1 =
         DatabaseUtil::GetOriginIdentifier(GURL(kOrigin1Url));
-    const string16 kOrigin2 =
+    const base::string16 kOrigin2 =
         DatabaseUtil::GetOriginIdentifier(GURL(kOrigin2Url));
-    const string16 kDB1 = ASCIIToUTF16("db1");
-    const string16 kDB2 = ASCIIToUTF16("db2");
-    const string16 kDescription = ASCIIToUTF16("database_description");
+    const base::string16 kDB1 = ASCIIToUTF16("db1");
+    const base::string16 kDB2 = ASCIIToUTF16("db2");
+    const base::string16 kDescription = ASCIIToUTF16("database_description");
 
     // Initialize the tracker database.
     MessageLoop message_loop;
     base::ScopedTempDir temp_dir;
     ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
     base::FilePath origin1_db_dir;
     base::FilePath origin2_db_dir;
     {
       scoped_refptr<quota::MockSpecialStoragePolicy> special_storage_policy =
           new quota::MockSpecialStoragePolicy;
@@ skipping 49 matching lines @@
         file_util::PathExists(tracker->GetFullDBFilePath(kOrigin1, kDB1)));
     EXPECT_TRUE(
         file_util::PathExists(tracker->GetFullDBFilePath(kOrigin2, kDB2)));
 
     EXPECT_TRUE(file_util::PathExists(origin1_db_dir));
     EXPECT_TRUE(file_util::PathExists(origin2_db_dir));
   }
 
   static void EmptyDatabaseNameIsValid() {
     const GURL kOrigin(kOrigin1Url);
-    const string16 kOriginId = DatabaseUtil::GetOriginIdentifier(kOrigin);
-    const string16 kEmptyName;
-    const string16 kDescription(ASCIIToUTF16("description"));
-    const string16 kChangedDescription(ASCIIToUTF16("changed_description"));
+    const base::string16 kOriginId = DatabaseUtil::GetOriginIdentifier(kOrigin);
+    const base::string16 kEmptyName;
+    const base::string16 kDescription(ASCIIToUTF16("description"));
+    const base::string16 kChangedDescription(
+        ASCIIToUTF16("changed_description"));
 
     // Initialize a tracker database, no need to put it on disk.
     const bool kUseInMemoryTrackerDatabase = true;
     base::ScopedTempDir temp_dir;
     ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
     scoped_refptr<DatabaseTracker> tracker(
         new DatabaseTracker(temp_dir.path(), kUseInMemoryTrackerDatabase,
                             NULL, NULL, NULL));
 
     // Starts off with no databases.
@@ skipping 23 matching lines @@
     // Deleting it should return to the initial state.
     EXPECT_EQ(net::OK, tracker->DeleteDatabase(kOriginId, kEmptyName,
                                                net::CompletionCallback()));
     infos.clear();
     EXPECT_TRUE(tracker->GetAllOriginsInfo(&infos));
     EXPECT_TRUE(infos.empty());
   }
 
   static void HandleSqliteError() {
     const GURL kOrigin(kOrigin1Url);
-    const string16 kOriginId = DatabaseUtil::GetOriginIdentifier(kOrigin);
-    const string16 kName(ASCIIToUTF16("name"));
-    const string16 kDescription(ASCIIToUTF16("description"));
+    const base::string16 kOriginId = DatabaseUtil::GetOriginIdentifier(kOrigin);
+    const base::string16 kName(ASCIIToUTF16("name"));
+    const base::string16 kDescription(ASCIIToUTF16("description"));
 
     // Initialize a tracker database, no need to put it on disk.
     const bool kUseInMemoryTrackerDatabase = true;
     base::ScopedTempDir temp_dir;
     ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
     scoped_refptr<DatabaseTracker> tracker(
         new DatabaseTracker(temp_dir.path(), kUseInMemoryTrackerDatabase,
                             NULL, NULL, NULL));
 
     // Setup to observe OnScheduledForDelete notifications.
@@ skipping 91 matching lines @@
 
 TEST(DatabaseTrackerTest, EmptyDatabaseNameIsValid) {
   DatabaseTracker_TestHelper_Test::EmptyDatabaseNameIsValid();
 }
 
 TEST(DatabaseTrackerTest, HandleSqliteError) {
   DatabaseTracker_TestHelper_Test::HandleSqliteError();
 }
 
 }  // namespace webkit_database