Move dom_storage to new locations.

webkit/browser/dom_storage/dom_storage_context.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 WEBKIT_DOM_STORAGE_DOM_STORAGE_CONTEXT_H_
-#define WEBKIT_DOM_STORAGE_DOM_STORAGE_CONTEXT_H_
+#ifndef WEBKIT_BROWSER_DOM_STORAGE_DOM_STORAGE_CONTEXT_H_
+#define WEBKIT_BROWSER_DOM_STORAGE_DOM_STORAGE_CONTEXT_H_
 
 #include <map>
 #include <set>
 #include <vector>
 
 #include "base/atomic_sequence_num.h"
 #include "base/basictypes.h"
 #include "base/files/file_path.h"
 #include "base/gtest_prod_util.h"
 #include "base/memory/ref_counted.h"
@@ skipping 77 matching lines @@
   // Returns the directory path for localStorage, or an empty directory, if
   // there is no backing on disk.
   const base::FilePath& localstorage_directory() { return localstorage_directory_; }
 
   // Returns the directory path for sessionStorage, or an empty directory, if
   // there is no backing on disk.
   const base::FilePath& sessionstorage_directory() {
     return sessionstorage_directory_;
   }
 
-  DomStorageTaskRunner* task_runner() const { return task_runner_; }
+  DomStorageTaskRunner* task_runner() const { return task_runner_.get(); }
   DomStorageNamespace* GetStorageNamespace(int64 namespace_id);
 
   void GetLocalStorageUsage(std::vector<LocalStorageUsageInfo>* infos,
                             bool include_file_info);
   void GetSessionStorageUsage(std::vector<SessionStorageUsageInfo>* infos);
   void DeleteLocalStorage(const GURL& origin);
   void DeleteSessionStorage(const SessionStorageUsageInfo& usage_info);
   void PurgeMemory();
 
   // Used by content settings to alter the behavior around
@@ skipping 105 matching lines @@
   // be needed for session restore).
   std::set<std::string> protected_persistent_session_ids_;
 
   // Mapping between persistent namespace IDs and namespace IDs for
   // sessionStorage.
   std::map<std::string, int64> persistent_namespace_id_to_namespace_id_;
 };
 
 }  // namespace dom_storage
 
-#endif  // WEBKIT_DOM_STORAGE_DOM_STORAGE_CONTEXT_H_
+#endif  // WEBKIT_BROWSER_DOM_STORAGE_DOM_STORAGE_CONTEXT_H_