Move dom_storage to new locations.

webkit/renderer/dom_storage/dom_storage_cached_area.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 "webkit/dom_storage/dom_storage_cached_area.h"
+#include "webkit/renderer/dom_storage/dom_storage_cached_area.h"
 
 #include "base/basictypes.h"
 #include "base/time.h"
 #include "base/metrics/histogram.h"
-#include "webkit/dom_storage/dom_storage_map.h"
-#include "webkit/dom_storage/dom_storage_proxy.h"
+#include "webkit/common/dom_storage/dom_storage_map.h"
+#include "webkit/renderer/dom_storage/dom_storage_proxy.h"
 
 namespace dom_storage {
 
 DomStorageCachedArea::DomStorageCachedArea(
     int64 namespace_id, const GURL& origin, DomStorageProxy* proxy)
     : ignore_all_mutations_(false),
       namespace_id_(namespace_id), origin_(origin),
       proxy_(proxy), weak_factory_(this) {
 }
 
@@ skipping 62 matching lines @@
   // Ignore all mutations until OnClearComplete time.
   ignore_all_mutations_ = true;
   proxy_->ClearArea(
       connection_id, page_url,
       base::Bind(&DomStorageCachedArea::OnClearComplete,
                  weak_factory_.GetWeakPtr()));
 }
 
 void DomStorageCachedArea::ApplyMutation(
     const NullableString16& key, const NullableString16& new_value) {
-  if (!map_ || ignore_all_mutations_)
+  if (!map_.get() || ignore_all_mutations_)
     return;
 
   if (key.is_null()) {
     // It's a clear event.
     scoped_refptr<DomStorageMap> old = map_;
     map_ = new DomStorageMap(dom_storage::kPerAreaQuota);
 
     // We have to retain local additions which happened after this
     // clear operation from another process.
     std::map<base::string16, int>::iterator iter =
@@ skipping 23 matching lines @@
   // It's a set item event.
   // We turn off quota checking here to accomodate the over budget
   // allowance that's provided in the browser process.
   NullableString16 unused;
   map_->set_quota(kint32max);
   map_->SetItem(key.string(), new_value.string(), &unused);
   map_->set_quota(dom_storage::kPerAreaQuota);
 }
 
 size_t DomStorageCachedArea::MemoryBytesUsedByCache() const {
-  return map_ ? map_->bytes_used() : 0;
+  return map_.get() ? map_->bytes_used() : 0;
 }
 
 void DomStorageCachedArea::Prime(int connection_id) {
-  DCHECK(!map_);
+  DCHECK(!map_.get());
 
   // The LoadArea method is actually synchronous, but we have to
   // wait for an asyncly delivered message to know when incoming
   // mutation events should be applied. Our valuemap is plucked
   // from ipc stream out of order, mutations in front if it need
   // to be ignored.
 
   // Ignore all mutations until OnLoadComplete time.
   ignore_all_mutations_ = true;
   ValuesMap values;
@@ skipping 68 matching lines @@
     ignore_key_mutations_.erase(found);
 }
 
 void DomStorageCachedArea::OnClearComplete(bool success) {
   DCHECK(success);
   DCHECK(ignore_all_mutations_);
   ignore_all_mutations_ = false;
 }
 
 }  // namespace dom_storage