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

content/renderer/dom_storage/dom_storage_cached_area.h

 // 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.
 
 #ifndef CONTENT_RENDERER_DOM_STORAGE_DOM_STORAGE_CACHED_AREA_H_
 #define CONTENT_RENDERER_DOM_STORAGE_DOM_STORAGE_CACHED_AREA_H_
 
 #include <map>
 
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
 #include "base/strings/nullable_string16.h"
 #include "content/common/content_export.h"
 #include "url/gurl.h"
 
-namespace dom_storage {
-class DomStorageMap;
+namespace content {
+class DOMStorageMap;

[jam, 2013/08/06 16:13:49]

nit: just move this to line 22

[kinuko, 2013/08/07 14:29:52]

Done.

 }
 
 namespace content {
 
 class DomStorageProxy;
 
 // Unlike the other classes in the dom_storage library, this one is intended
 // for use in renderer processes. It maintains a complete cache of the
 // origin's Map of key/value pairs for fast access. The cache is primed on
 // first access and changes are written to the backend thru the |proxy|.
@@ skipping 52 matching lines @@
 
   bool should_ignore_key_mutation(const base::string16& key) const {
     return ignore_key_mutations_.find(key) != ignore_key_mutations_.end();
   }
 
   bool ignore_all_mutations_;
   std::map<base::string16, int> ignore_key_mutations_;
 
   int64 namespace_id_;
   GURL origin_;
-  scoped_refptr<dom_storage::DomStorageMap> map_;
+  scoped_refptr<DOMStorageMap> map_;
   scoped_refptr<DomStorageProxy> proxy_;
   base::WeakPtrFactory<DomStorageCachedArea> weak_factory_;
 };
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_DOM_STORAGE_DOM_STORAGE_CACHED_AREA_H_