Make DOMStorageDispatcherHost be a message filter (and rename it accordingly)...

chrome/browser/in_process_webkit/dom_storage_context.h

 // Copyright (c) 2010 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 CHROME_BROWSER_IN_PROCESS_WEBKIT_DOM_STORAGE_CONTEXT_H_
 #define CHROME_BROWSER_IN_PROCESS_WEBKIT_DOM_STORAGE_CONTEXT_H_
 #pragma once
 
 #include <map>
 #include <set>
 
 #include "base/file_path.h"
 #include "base/string16.h"
 #include "base/time.h"
 
 class DOMStorageArea;
-class DOMStorageDispatcherHost;
+class DOMStorageMessageFilter;
 class DOMStorageNamespace;
 class WebKitContext;
 
 // This is owned by WebKitContext and is all the dom storage information that's
-// shared by all the ResourceMessageFilter/DOMStorageDispatcherHosts that share
-// the same profile.  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.
+// shared by all the DOMStorageMessageFilters that share the same profile.  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.
 //
 // NOTE: Virtual methods facilitate mocking functions for testing.
 class DOMStorageContext {
  public:
   explicit DOMStorageContext(WebKitContext* webkit_context);
   virtual ~DOMStorageContext();
 
   // Allocate a new storage area id.  Only call on the WebKit thread.
   int64 AllocateStorageAreaId();
 
@@ skipping 11 matching lines @@
   DOMStorageArea* GetStorageArea(int64 id);
 
   // Called on WebKit thread when a session storage namespace can be deleted.
   void DeleteSessionStorageNamespace(int64 namespace_id);
 
   // Get a namespace from an id.  What's returned is owned by this class.  If
   // allocation_allowed is true, then this function will create the storage
   // namespace if it hasn't been already.
   DOMStorageNamespace* GetStorageNamespace(int64 id, bool allocation_allowed);
 
-  // Sometimes an event from one DOM storage dispatcher host requires
+  // Sometimes an event from one DOM storage message filter requires
   // communication to all of them.
-  typedef std::set<DOMStorageDispatcherHost*> DispatcherHostSet;
-  void RegisterDispatcherHost(DOMStorageDispatcherHost* dispatcher_host);
-  void UnregisterDispatcherHost(DOMStorageDispatcherHost* dispatcher_host);
-  const DispatcherHostSet* GetDispatcherHostSet() const;
+  typedef std::set<DOMStorageMessageFilter*> MessageFilterSet;
+  void RegisterMessageFilter(DOMStorageMessageFilter* message_filter);
+  void UnregisterMessageFilter(DOMStorageMessageFilter* MessageFilter);
+  const MessageFilterSet* GetMessageFilterSet() const;
 
   // Tells storage namespaces to purge any memory they do not need.
   virtual void PurgeMemory();
 
   // Delete any local storage files that have been touched since the cutoff
   // date that's supplied.
   void DeleteDataModifiedSince(const base::Time& cutoff,
                                const char* url_scheme_to_be_skipped,
                                const std::vector<string16>& protected_origins);
 
@@ skipping 53 matching lines @@
   // True if the destructor should delete its files.
   bool clear_local_state_on_exit_;
 
   // Path where the profile data is stored.
   // TODO(pastarmovj): Keep in mind that unlike indexed db data_path_ variable
   // this one still has to point to the upper level dir because of the
   // MigrateLocalStorageDirectory function. Once this function disappears we can
   // make it point directly to the dom storage path.
   FilePath data_path_;
 
-  // All the DOMStorageDispatcherHosts that are attached to us. ONLY USE ON THE
+  // All the DOMStorageMessageFilters that are attached to us. ONLY USE ON THE
   // IO THREAD!
-  DispatcherHostSet dispatcher_host_set_;
+  MessageFilterSet message_filter_set_;
 
   // Maps ids to StorageAreas.  We do NOT own these objects.  StorageNamespace
   // (which does own them) will notify us when we should remove the entries.
   typedef std::map<int64, DOMStorageArea*> StorageAreaMap;
   StorageAreaMap storage_area_map_;
 
   // Maps ids to StorageNamespaces.  We own these objects.
   typedef std::map<int64, DOMStorageNamespace*> StorageNamespaceMap;
   StorageNamespaceMap storage_namespace_map_;
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(DOMStorageContext);
 };
 
 #endif  // CHROME_BROWSER_IN_PROCESS_WEBKIT_DOM_STORAGE_CONTEXT_H_