Replace string16 with base::string16 in src/webkit

webkit/dom_storage/dom_storage_cached_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 <list>
 
 #include "base/bind.h"
 #include "base/utf_string_conversions.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "webkit/dom_storage/dom_storage_cached_area.h"
@@ skipping 12 matching lines @@
   // DomStorageProxy interface for use by DomStorageCachedArea.
 
   virtual void LoadArea(int connection_id, ValuesMap* values,
                         const CompletionCallback& callback) OVERRIDE {
     pending_callbacks_.push_back(callback);
     observed_load_area_ = true;
     observed_connection_id_ = connection_id;
     *values = load_area_return_values_;
   }
 
-  virtual void SetItem(int connection_id, const string16& key,
-                       const string16& value, const GURL& page_url,
+  virtual void SetItem(int connection_id, const base::string16& key,
+                       const base::string16& value, const GURL& page_url,
                        const CompletionCallback& callback) OVERRIDE {
     pending_callbacks_.push_back(callback);
     observed_set_item_ = true;
     observed_connection_id_ = connection_id;
     observed_key_ = key;
     observed_value_ = value;
     observed_page_url_ = page_url;
   }
 
-  virtual void RemoveItem(int connection_id, const string16& key,
+  virtual void RemoveItem(int connection_id, const base::string16& key,
                           const GURL& page_url,
                           const CompletionCallback& callback) OVERRIDE {
     pending_callbacks_.push_back(callback);
     observed_remove_item_ = true;
     observed_connection_id_ = connection_id;
     observed_key_ = key;
     observed_page_url_ = page_url;
   }
 
   virtual void ClearArea(int connection_id,
@@ skipping 31 matching lines @@
 
   typedef std::list<CompletionCallback> CallbackList;
 
   ValuesMap load_area_return_values_;
   CallbackList pending_callbacks_;
   bool observed_load_area_;
   bool observed_set_item_;
   bool observed_remove_item_;
   bool observed_clear_area_;
   int observed_connection_id_;
-  string16 observed_key_;
-  string16 observed_value_;
+  base::string16 observed_key_;
+  base::string16 observed_value_;
   GURL observed_page_url_;
 
  private:
   virtual ~MockProxy() {}
 };
 }  // namespace
 
 class DomStorageCachedAreaTest : public testing::Test {
  public:
   DomStorageCachedAreaTest()
     : kNamespaceId(10),
       kOrigin("http://dom_storage/"),
       kKey(ASCIIToUTF16("key")),
       kValue(ASCIIToUTF16("value")),
       kPageUrl("http://dom_storage/page") {
   }
 
   const int64 kNamespaceId;
   const GURL kOrigin;
-  const string16 kKey;
-  const string16 kValue;
+  const base::string16 kKey;
+  const base::string16 kValue;
   const GURL kPageUrl;
 
   virtual void SetUp() {
     mock_proxy_ = new MockProxy();
   }
 
   bool IsPrimed(DomStorageCachedArea* cached_area) {
     return cached_area->map_.get();
   }
 
   bool IsIgnoringAllMutations(DomStorageCachedArea* cached_area) {
     return cached_area->ignore_all_mutations_;
   }
 
   bool IsIgnoringKeyMutations(DomStorageCachedArea* cached_area,
-                              const string16& key) {
+                              const base::string16& key) {
     return cached_area->should_ignore_key_mutation(key);
   }
 
   void ResetAll(DomStorageCachedArea* cached_area) {
     cached_area->Reset();
     mock_proxy_->ResetObservations();
     mock_proxy_->pending_callbacks_.clear();
   }
 
   void ResetCacheOnly(DomStorageCachedArea* cached_area) {
@@ skipping 195 matching lines @@
   EXPECT_FALSE(IsIgnoringKeyMutations(cached_area, kKey));
 
   // A failed set item operation should Reset the cache.
   EXPECT_TRUE(cached_area->SetItem(kConnectionId, kKey, kValue, kPageUrl));
   EXPECT_TRUE(IsIgnoringKeyMutations(cached_area, kKey));
   mock_proxy_->CompleteOnePendingCallback(false);
   EXPECT_FALSE(IsPrimed(cached_area));
 }
 
 }  // namespace dom_storage