Replace string16 with base::string16 in src/webkit

webkit/dom_storage/dom_storage_context_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 13 matching lines @@
  public:
   DomStorageContextTest()
     : kOrigin(GURL("http://dom_storage/")),
       kKey(ASCIIToUTF16("key")),
       kValue(ASCIIToUTF16("value")),
       kDontIncludeFileInfo(false),
       kDoIncludeFileInfo(true) {
   }
 
   const GURL kOrigin;
-  const string16 kKey;
-  const string16 kValue;
+  const base::string16 kKey;
+  const base::string16 kValue;
   const bool kDontIncludeFileInfo;
   const bool kDoIncludeFileInfo;
 
   virtual void SetUp() {
     ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
     storage_policy_ = new quota::MockSpecialStoragePolicy;
     task_runner_ = new MockDomStorageTaskRunner(
             base::MessageLoopProxy::current());
     context_ = new DomStorageContext(temp_dir_.path(),
                                      base::FilePath(),
@@ skipping 152 matching lines @@
   ASSERT_EQ(temp_dir_.path(), context_->sessionstorage_directory());
 
   // Write data.
   const int kSessionStorageNamespaceId = 1;
   const std::string kPersistentId = "persistent";
   context_->CreateSessionNamespace(kSessionStorageNamespaceId,
                                    kPersistentId);
   DomStorageNamespace* dom_namespace =
       context_->GetStorageNamespace(kSessionStorageNamespaceId);
   DomStorageArea* area = dom_namespace->OpenStorageArea(kOrigin);
-  const string16 kKey(ASCIIToUTF16("foo"));
-  const string16 kValue(ASCIIToUTF16("bar"));
+  const base::string16 kKey(ASCIIToUTF16("foo"));
+  const base::string16 kValue(ASCIIToUTF16("bar"));
   NullableString16 old_nullable_value;
   area->SetItem(kKey, kValue, &old_nullable_value);
   dom_namespace->CloseStorageArea(area);
 
   // Destroy and recreate the DomStorageContext.
   context_->Shutdown();
   context_ = NULL;
   MessageLoop::current()->RunUntilIdle();
   context_ = new DomStorageContext(temp_dir_.path(),
                                    temp_dir_.path(),
@@ skipping 33 matching lines @@
   area = dom_namespace->OpenStorageArea(kOrigin);
   read_value = area->GetItem(kKey);
   EXPECT_TRUE(read_value.is_null());
   dom_namespace->CloseStorageArea(area);
   context_->Shutdown();
   context_ = NULL;
   MessageLoop::current()->RunUntilIdle();
 }
 
 }  // namespace dom_storage