Move dom_storage to new locations.

webkit/browser/dom_storage/dom_storage_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_area.h"
+#include "webkit/browser/dom_storage/dom_storage_area.h"
 
 #include "base/bind.h"
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
 #include "base/time.h"
 #include "base/utf_string_conversions.h"
-#include "third_party/WebKit/Source/Platform/chromium/public/WebString.h"
+#include "third_party/WebKit/public/platform/WebString.h"
 #include "webkit/base/file_path_string_conversions.h"
 #include "webkit/base/origin_url_conversions.h"
 #include "webkit/browser/database/database_util.h"
+#include "webkit/browser/dom_storage/dom_storage_namespace.h"
+#include "webkit/browser/dom_storage/dom_storage_task_runner.h"
+#include "webkit/browser/dom_storage/local_storage_database_adapter.h"
+#include "webkit/browser/dom_storage/session_storage_database.h"
+#include "webkit/browser/dom_storage/session_storage_database_adapter.h"
+#include "webkit/common/dom_storage/dom_storage_map.h"
+#include "webkit/common/dom_storage/dom_storage_types.h"
 #include "webkit/common/fileapi/file_system_util.h"
-#include "webkit/dom_storage/dom_storage_map.h"
-#include "webkit/dom_storage/dom_storage_namespace.h"
-#include "webkit/dom_storage/dom_storage_task_runner.h"
-#include "webkit/dom_storage/dom_storage_types.h"
-#include "webkit/dom_storage/local_storage_database_adapter.h"
-#include "webkit/dom_storage/session_storage_database.h"
-#include "webkit/dom_storage/session_storage_database_adapter.h"
 
 using webkit_database::DatabaseUtil;
 
 namespace dom_storage {
 
 static const int kCommitTimerSeconds = 1;
 
 DomStorageArea::CommitBatch::CommitBatch()
   : clear_all_first(false) {
 }
@@ skipping 161 matching lines @@
 }
 
 DomStorageArea* DomStorageArea::ShallowCopy(
     int64 destination_namespace_id,
     const std::string& destination_persistent_namespace_id) {
   DCHECK_NE(kLocalStorageNamespaceId, namespace_id_);
   DCHECK_NE(kLocalStorageNamespaceId, destination_namespace_id);
 
   DomStorageArea* copy = new DomStorageArea(
       destination_namespace_id, destination_persistent_namespace_id, origin_,
-      session_storage_backing_, task_runner_);
+      session_storage_backing_.get(), task_runner_.get());
   copy->map_ = map_;
   copy->is_shutdown_ = is_shutdown_;
   copy->is_initial_import_done_ = true;
 
   // All the uncommitted changes to this area need to happen before the actual
   // shallow copy is made (scheduled by the upper layer). Another OnCommitTimer
   // call might be in the event queue at this point, but it's handled gracefully
   // when it fires.
   if (commit_batch_)
     OnCommitTimer();
@@ skipping 172 matching lines @@
         commit_batch_->clear_all_first,
         commit_batch_->changed_values);
     DCHECK(success);
   }
   commit_batch_.reset();
   backing_.reset();
   session_storage_backing_ = NULL;
 }
 
 }  // namespace dom_storage