Move dom_storage to new locations.

webkit/browser/dom_storage/dom_storage_context_unittest.cc

Index: webkit/browser/dom_storage/dom_storage_context_unittest.cc
===================================================================
--- webkit/browser/dom_storage/dom_storage_context_unittest.cc	(revision 0)
+++ webkit/browser/dom_storage/dom_storage_context_unittest.cc	(working copy)
@@ -11,12 +11,12 @@
 #include "base/time.h"
 #include "base/utf_string_conversions.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include "webkit/dom_storage/dom_storage_area.h"
-#include "webkit/dom_storage/dom_storage_context.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/quota/mock_special_storage_policy.h"
+#include "webkit/browser/dom_storage/dom_storage_area.h"
+#include "webkit/browser/dom_storage/dom_storage_context.h"
+#include "webkit/browser/dom_storage/dom_storage_namespace.h"
+#include "webkit/browser/dom_storage/dom_storage_task_runner.h"
+#include "webkit/browser/quota/mock_special_storage_policy.h"
+#include "webkit/common/dom_storage/dom_storage_types.h"
 
 namespace dom_storage {
 
@@ -43,8 +43,8 @@
             base::MessageLoopProxy::current());
     context_ = new DomStorageContext(temp_dir_.path(),
                                      base::FilePath(),
-                                     storage_policy_,
-                                     task_runner_);
+                                     storage_policy_.get(),
+                                     task_runner_.get());
   }
 
   virtual void TearDown() {
@@ -192,8 +192,8 @@
   // Create a DomStorageContext which will save sessionStorage on disk.
   context_ = new DomStorageContext(temp_dir_.path(),
                                    temp_dir_.path(),
-                                   storage_policy_,
-                                   task_runner_);
+                                   storage_policy_.get(),
+                                   task_runner_.get());
   context_->SetSaveSessionStorageOnDisk();
   ASSERT_EQ(temp_dir_.path(), context_->sessionstorage_directory());
 
@@ -216,7 +216,8 @@
   context_ = NULL;
   base::MessageLoop::current()->RunUntilIdle();
   context_ = new DomStorageContext(
-      temp_dir_.path(), temp_dir_.path(), storage_policy_, task_runner_);
+      temp_dir_.path(), temp_dir_.path(),
+      storage_policy_.get(), task_runner_.get());
   context_->SetSaveSessionStorageOnDisk();
 
   // Read the data back.
@@ -239,7 +240,8 @@
   context_ = NULL;
   base::MessageLoop::current()->RunUntilIdle();
   context_ = new DomStorageContext(
-      temp_dir_.path(), temp_dir_.path(), storage_policy_, task_runner_);
+      temp_dir_.path(), temp_dir_.path(),
+      storage_policy_.get(), task_runner_.get());
   context_->SetSaveSessionStorageOnDisk();
 
   // Now there should be no data.