Make the content::DOMStorageContext methods callable on the main thread and hide the threading deta…

content/browser/in_process_webkit/dom_storage_context_impl.h

 // Copyright (c) 2011 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 CONTENT_BROWSER_IN_PROCESS_WEBKIT_DOM_STORAGE_CONTEXT_IMPL_H_
 #define CONTENT_BROWSER_IN_PROCESS_WEBKIT_DOM_STORAGE_CONTEXT_IMPL_H_
 #pragma once
 
 #include <map>
 #include <set>
 
 #include "base/compiler_specific.h"
 #include "base/file_path.h"
 #include "base/gtest_prod_util.h"
+#include "base/memory/ref_counted.h"
 #include "base/time.h"
 #include "content/public/browser/dom_storage_context.h"
 
 class DOMStorageArea;
 class DOMStorageMessageFilter;
 class DOMStorageNamespace;
 
 namespace base {
 class MessageLoopProxy;
 class SequencedTaskRunner;
 }
 
 namespace quota {
 class SpecialStoragePolicy;
 }
 
 // This is owned by BrowserContext and is all the dom storage information that's
 // shared by all the DOMStorageMessageFilters that share the same browser
 // context.  The specifics of responsibilities are fairly well documented here
 // and in StorageNamespace and StorageArea.  Everything is only to be accessed
 // on the WebKit thread unless noted otherwise.
 class CONTENT_EXPORT DOMStorageContextImpl :
-    NON_EXPORTED_BASE(public content::DOMStorageContext) {
+    NON_EXPORTED_BASE(public content::DOMStorageContext),
+    public base::RefCountedThreadSafe<DOMStorageContextImpl> {
  public:
   // If |data_path| is empty, nothing will be saved to disk.
   DOMStorageContextImpl(const FilePath& data_path,
                         quota::SpecialStoragePolicy* special_storage_policy);
   virtual ~DOMStorageContextImpl();
 
   // DOMStorageContext implementation:
-  virtual base::SequencedTaskRunner* task_runner() const OVERRIDE;
-  virtual std::vector<FilePath> GetAllStorageFiles() OVERRIDE;
+  virtual void GetAllStorageFiles(GetAllStorageFilesCallback callback) OVERRIDE;
   virtual FilePath GetFilePath(const string16& origin_id) const OVERRIDE;
   virtual void DeleteForOrigin(const string16& origin_id) OVERRIDE;
   virtual void DeleteLocalStorageFile(const FilePath& file_path) OVERRIDE;
   virtual void DeleteDataModifiedSince(const base::Time& cutoff) OVERRIDE;
 
   // Invalid storage id.  No storage session will ever report this value.
   // Used in DOMStorageMessageFilter::OnStorageAreaId when coping with
   // interactions with non-existent storage sessions.
   static const int64 kInvalidStorageId = -1;
 
@@ skipping 62 matching lines @@
 
   // Get a new session storage namespace.  The object is owned by this class.
   DOMStorageNamespace* CreateSessionStorage(int64 namespace_id);
 
   // Used internally to register storage namespaces we create.
   void RegisterStorageNamespace(DOMStorageNamespace* storage_namespace);
 
   // The WebKit thread half of CloneSessionStorage above.
   void CompleteCloningSessionStorage(int64 existing_id, int64 clone_id);
 
+  void RunAllStorageFilesCallback(
+    const std::vector<FilePath>& files, GetAllStorageFilesCallback callback);
+
   // The last used storage_area_id and storage_namespace_id's.  For the storage
   // namespaces, IDs allocated on the UI thread are positive and count up while
   // IDs allocated on the IO thread are negative and count down.  This allows us
   // to allocate unique IDs on both without any locking.  All storage area ids
   // are allocated on the WebKit thread.
   int64 last_storage_area_id_;
   int64 last_session_storage_namespace_id_on_ui_thread_;
   int64 last_session_storage_namespace_id_on_io_thread_;
 
   // True if the destructor should delete its files.
@@ skipping 22 matching lines @@
   typedef std::map<int64, DOMStorageNamespace*> StorageNamespaceMap;
   StorageNamespaceMap storage_namespace_map_;
 
   scoped_refptr<quota::SpecialStoragePolicy> special_storage_policy_;
   scoped_refptr<base::MessageLoopProxy> webkit_message_loop_;
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(DOMStorageContextImpl);
 };
 
 #endif  // CONTENT_BROWSER_IN_PROCESS_WEBKIT_DOM_STORAGE_CONTEXT_IMPL_H_