Move webkit/{browser,common}/dom_storage into content/

content/renderer/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 "content/renderer/dom_storage/dom_storage_cached_area.h"
 
 #include <list>
 
 #include "base/bind.h"
 #include "base/strings/utf_string_conversions.h"
 #include "content/renderer/dom_storage/dom_storage_proxy.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace content {
 
 namespace {
 // A mock implementation of the DomStorageProxy interface.
 class MockProxy : public DomStorageProxy {
  public:
   MockProxy() {
     ResetObservations();
   }
 
   // DomStorageProxy interface for use by DomStorageCachedArea.
 
   virtual void LoadArea(int connection_id,
-                        dom_storage::ValuesMap* values,
+                        DOMStorageValuesMap* 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 base::string16& key,
                        const base::string16& value,
@@ skipping 46 matching lines @@
   }
 
   void CompleteOnePendingCallback(bool success) {
     ASSERT_TRUE(!pending_callbacks_.empty());
     pending_callbacks_.front().Run(success);
     pending_callbacks_.pop_front();
   }
 
   typedef std::list<CompletionCallback> CallbackList;
 
-  dom_storage::ValuesMap load_area_return_values_;
+  DOMStorageValuesMap 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_;
   base::string16 observed_key_;
   base::string16 observed_value_;
   GURL observed_page_url_;
 
@@ skipping 241 matching lines @@
   mock_proxy_->CompleteOnePendingCallback(true);  // remove completion
   EXPECT_FALSE(IsIgnoringKeyMutations(cached_area.get(), kKey));
 
   // A failed set item operation should Reset the cache.
   EXPECT_TRUE(cached_area->SetItem(kConnectionId, kKey, kValue, kPageUrl));
   EXPECT_TRUE(IsIgnoringKeyMutations(cached_area.get(), kKey));
   mock_proxy_->CompleteOnePendingCallback(false);
   EXPECT_FALSE(IsPrimed(cached_area.get()));
 }
 
-}  // namespace dom_storage
+}  // namespace content