Remove storage context accessors from ResourceContext.

content/browser/worker_host/worker_process_host.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 CONTENT_BROWSER_WORKER_HOST_WORKER_PROCESS_HOST_H_
 #define CONTENT_BROWSER_WORKER_HOST_WORKER_PROCESS_HOST_H_
 
 #include <list>
+#include <string>
 #include <utility>
 
 #include "base/basictypes.h"
 #include "base/file_path.h"
 #include "base/memory/scoped_ptr.h"
 #include "content/common/content_export.h"
 #include "content/browser/worker_host/worker_document_set.h"
 #include "content/public/browser/browser_child_process_host_delegate.h"
 #include "content/public/browser/browser_child_process_host_iterator.h"
 #include "googleurl/src/gurl.h"
 #include "ipc/ipc_sender.h"
 
 class BrowserChildProcessHostImpl;
+class ChromeAppCacheService;
+class IndexedDBContextImpl;
 
 namespace content {
 class ResourceContext;
 class WorkerServiceImpl;
 }  // namespace content
 
+namespace fileapi {
+class FileSystemContext;
+}  // namespace fileapi
+
+namespace webkit_database {
+class DatabaseTracker;
+}  // namespace webkit_database
+
 // The WorkerProcessHost is the interface that represents the browser side of
 // the browser <-> worker communication channel. There will be one
 // WorkerProcessHost per worker process.  Currently each worker runs in its own
 // process, but that may change.  However, we do assume (by storing a
 // net::URLRequestContext) that a WorkerProcessHost serves a single
 // BrowserContext.
 class WorkerProcessHost : public content::BrowserChildProcessHostDelegate,
                           public IPC::Sender {
  public:
   // Contains information about each worker instance, needed to forward messages
   // between the renderer and worker processes.
   class WorkerInstance {
    public:
     WorkerInstance(const GURL& url,
                    const string16& name,
                    int worker_route_id,
                    int parent_process_id,
                    int64 main_resource_appcache_id,
-                   content::ResourceContext* resource_context);
+                   const std::string& partition_id,
+                   content::ResourceContext* resource_context,
+                   ChromeAppCacheService* appcache_service,
+                   fileapi::FileSystemContext* filesystem_context,
+                   webkit_database::DatabaseTracker* database_tracker,
+                   IndexedDBContextImpl* indexed_db_context);
     // Used for pending instances. Rest of the parameters are ignored.
     WorkerInstance(const GURL& url,
                    bool shared,
                    const string16& name,
-                   content::ResourceContext* resource_context);
+                   const std::string& partition_id,
+                   content::ResourceContext* resource_context,
+                   ChromeAppCacheService* appcache_service,
+                   fileapi::FileSystemContext* filesystem_context,
+                   webkit_database::DatabaseTracker* database_tracker,
+                   IndexedDBContextImpl* indexed_db_context);
     ~WorkerInstance();
 
     // Unique identifier for a worker client.
     typedef std::pair<WorkerMessageFilter*, int> FilterInfo;
 
     // APIs to manage the filter list for a given instance.
     void AddFilter(WorkerMessageFilter* filter, int route_id);
     void RemoveFilter(WorkerMessageFilter* filter, int route_id);
     void RemoveFilters(WorkerMessageFilter* filter);
     bool HasFilter(WorkerMessageFilter* filter, int route_id) const;
     bool RendererIsParent(int render_process_id, int render_view_id) const;
     int NumFilters() const { return filters_.size(); }
     // Returns the single filter (must only be one).
     FilterInfo GetFilter() const;
 
     typedef std::list<FilterInfo> FilterList;
     const FilterList& filters() const { return filters_; }
 
     // Checks if this WorkerInstance matches the passed url/name params
     // (per the comparison algorithm in the WebWorkers spec). This API only
     // applies to shared workers.
     bool Matches(
         const GURL& url,
         const string16& name,
+        const std::string& partition_id,
         content::ResourceContext* resource_context) const;
 
     // Shares the passed instance's WorkerDocumentSet with this instance. This
     // instance's current WorkerDocumentSet is dereferenced (and freed if this
     // is the only reference) as a result.
     void ShareDocumentSet(const WorkerInstance& instance) {
       worker_document_set_ = instance.worker_document_set_;
     };
 
     // Accessors
     bool closed() const { return closed_; }
     void set_closed(bool closed) { closed_ = closed; }
     const GURL& url() const { return url_; }
     const string16 name() const { return name_; }
     int worker_route_id() const { return worker_route_id_; }
     int parent_process_id() const { return parent_process_id_; }
     int64 main_resource_appcache_id() const {
       return main_resource_appcache_id_;
     }
     WorkerDocumentSet* worker_document_set() const {
       return worker_document_set_;
     }
     content::ResourceContext* resource_context() const {
       return resource_context_;
     }
+    const std::string& partition_id() const {
+      return partition_id_;
+    }
+    ChromeAppCacheService* appcache_service() const {
+      return appcache_service_;
+    }
+    fileapi::FileSystemContext* filesystem_context() const {
+      return filesystem_context_;
+    }
+    webkit_database::DatabaseTracker* database_tracker() const {
+      return database_tracker_;
+    }
+    IndexedDBContextImpl* indexed_db_context() const {
+      return indexed_db_context_;
+    }
 
    private:
     // Set of all filters (clients) associated with this worker.
     GURL url_;
     bool closed_;
     string16 name_;
     int worker_route_id_;
     int parent_process_id_;
     int64 main_resource_appcache_id_;
     FilterList filters_;
     scoped_refptr<WorkerDocumentSet> worker_document_set_;
+    std::string partition_id_;
     content::ResourceContext* const resource_context_;
+    ChromeAppCacheService* const appcache_service_;
+    fileapi::FileSystemContext* const filesystem_context_;
+    webkit_database::DatabaseTracker* const database_tracker_;
+    IndexedDBContextImpl* const indexed_db_context_;
   };
 
-  explicit WorkerProcessHost(content::ResourceContext* resource_context);
+  WorkerProcessHost(const std::string& partition_id,
+                    content::ResourceContext* resource_context,
+                    ChromeAppCacheService* appcache_service,
+                    fileapi::FileSystemContext* filesystem_context,
+                    webkit_database::DatabaseTracker* database_tracker,
+                    IndexedDBContextImpl* indexed_db_context);
   virtual ~WorkerProcessHost();
 
   // IPC::Sender implementation:
   virtual bool Send(IPC::Message* message) OVERRIDE;
 
   // Starts the process.  Returns true iff it succeeded.
   // |render_process_id| is the renderer process responsible for starting this
   // worker.
   bool Init(int render_process_id);
 
@@ skipping 61 matching lines @@
 
   // Updates the title shown in the task manager.
   void UpdateTitle();
 
   // Return a vector of all the render process/render view IDs that use the
   // given worker.
   std::vector<std::pair<int, int> > GetRenderViewIDsForWorker(int route_id);
 
   Instances instances_;
 
+  std::string partition_id_;
   content::ResourceContext* const resource_context_;
+  ChromeAppCacheService* const appcache_service_;
+  fileapi::FileSystemContext* const filesystem_context_;
+  webkit_database::DatabaseTracker* const database_tracker_;
+  IndexedDBContextImpl* const indexed_db_context_;
 
   // A reference to the filter associated with this worker process.  We need to
   // keep this around since we'll use it when forward messages to the worker
   // process.
   scoped_refptr<WorkerMessageFilter> worker_message_filter_;
 
   scoped_ptr<BrowserChildProcessHostImpl> process_;
 
   DISALLOW_COPY_AND_ASSIGN(WorkerProcessHost);
 };
 
 class WorkerProcessHostIterator
     : public content::BrowserChildProcessHostTypeIterator<WorkerProcessHost> {
  public:
   WorkerProcessHostIterator()
       : content::BrowserChildProcessHostTypeIterator<WorkerProcessHost>(
           content::PROCESS_TYPE_WORKER) {
   }
 };
 
 #endif  // CONTENT_BROWSER_WORKER_HOST_WORKER_PROCESS_HOST_H_