Move dom_storage to new locations.

webkit/browser/dom_storage/dom_storage_area.cc

Index: webkit/browser/dom_storage/dom_storage_area.cc
===================================================================
--- webkit/browser/dom_storage/dom_storage_area.cc	(revision 0)
+++ webkit/browser/dom_storage/dom_storage_area.cc	(working copy)
@@ -2,7 +2,7 @@
 // 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"
@@ -10,18 +10,18 @@
 #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;
 
@@ -203,7 +203,7 @@
 
   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;