Replace string16 with base::string16 in src/webkit

webkit/dom_storage/dom_storage_area_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/bind.h"
 #include "base/file_util.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/message_loop.h"
 #include "base/message_loop_proxy.h"
 #include "base/threading/sequenced_worker_pool.h"
@@ skipping 14 matching lines @@
  public:
   DomStorageAreaTest()
     : kOrigin(GURL("http://dom_storage/")),
       kKey(ASCIIToUTF16("key")),
       kValue(ASCIIToUTF16("value")),
       kKey2(ASCIIToUTF16("key2")),
       kValue2(ASCIIToUTF16("value2")) {
   }
 
   const GURL kOrigin;
-  const string16 kKey;
-  const string16 kValue;
-  const string16 kKey2;
-  const string16 kValue2;
+  const base::string16 kKey;
+  const base::string16 kValue;
+  const base::string16 kKey2;
+  const base::string16 kValue2;
 
   // Method used in the CommitTasks test case.
   void InjectedCommitSequencingTask(DomStorageArea* area) {
     // At this point the OnCommitTimer has run.
     // Verify that it put a commit in flight.
     EXPECT_EQ(1, area->commit_batches_in_flight_);
     EXPECT_FALSE(area->commit_batch_.get());
     EXPECT_TRUE(area->HasUncommittedChanges());
     // Make additional change and verify that a new commit batch
     // is created for that change.
     NullableString16 old_value;
     EXPECT_TRUE(area->SetItem(kKey2, kValue2, &old_value));
     EXPECT_TRUE(area->commit_batch_.get());
     EXPECT_EQ(1, area->commit_batches_in_flight_);
     EXPECT_TRUE(area->HasUncommittedChanges());
   }
 
   // Class used in the CommitChangesAtShutdown test case.
   class VerifyChangesCommittedDatabase : public DomStorageDatabase {
    public:
     VerifyChangesCommittedDatabase() {}
     virtual ~VerifyChangesCommittedDatabase() {
-      const string16 kKey(ASCIIToUTF16("key"));
-      const string16 kValue(ASCIIToUTF16("value"));
+      const base::string16 kKey(ASCIIToUTF16("key"));
+      const base::string16 kValue(ASCIIToUTF16("value"));
       ValuesMap values;
       ReadAllValues(&values);
       EXPECT_EQ(1u, values.size());
       EXPECT_EQ(kValue, values[kKey].string());
     }
   };
 
  private:
   MessageLoop message_loop_;
 };
 
 TEST_F(DomStorageAreaTest, DomStorageAreaBasics) {
   scoped_refptr<DomStorageArea> area(
       new DomStorageArea(1, std::string(), kOrigin, NULL, NULL));
-  string16 old_value;
+  base::string16 old_value;
   NullableString16 old_nullable_value;
   scoped_refptr<DomStorageArea> copy;
 
   // We don't focus on the underlying DomStorageMap functionality
   // since that's covered by seperate unit tests.
   EXPECT_EQ(kOrigin, area->origin());
   EXPECT_EQ(1, area->namespace_id());
   EXPECT_EQ(0u, area->Length());
   EXPECT_TRUE(area->SetItem(kKey, kValue, &old_nullable_value));
   EXPECT_TRUE(area->SetItem(kKey2, kValue2, &old_nullable_value));
@@ skipping 375 matching lines @@
   EXPECT_EQ(
       base::FilePath().AppendASCII("-journal"),
       DomStorageDatabase::GetJournalFilePath(base::FilePath()));
   EXPECT_EQ(
       base::FilePath().AppendASCII(".extensiononly-journal"),
       DomStorageDatabase::GetJournalFilePath(
           base::FilePath().AppendASCII(".extensiononly")));
 }
 
 }  // namespace dom_storage