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

chrome/browser/in_process_webkit/dom_storage_context.cc

 // 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.
 
 #include "chrome/browser/in_process_webkit/dom_storage_context.h"
 
 #include <algorithm>
 
 #include "base/file_path.h"
 #include "base/file_util.h"
@@ skipping 54 matching lines @@
 
 DOMStorageContext::DOMStorageContext(WebKitContext* webkit_context)
     : last_storage_area_id_(0),
       last_session_storage_namespace_id_on_ui_thread_(kLocalStorageNamespaceId),
       last_session_storage_namespace_id_on_io_thread_(kLocalStorageNamespaceId),
       clear_local_state_on_exit_(false) {
   data_path_ = webkit_context->data_path();
 }
 
 DOMStorageContext::~DOMStorageContext() {
-  // This should not go away until all DOM Storage Dispatcher hosts have gone
+  // This should not go away until all DOM Storage message filters have gone
   // away.  And they remove themselves from this list.
-  DCHECK(dispatcher_host_set_.empty());
+  DCHECK(message_filter_set_.empty());
 
   for (StorageNamespaceMap::iterator iter(storage_namespace_map_.begin());
        iter != storage_namespace_map_.end(); ++iter) {
     delete iter->second;
   }
 
   // Not being on the WEBKIT thread here means we are running in a unit test
   // where no clean up is needed.
   if (clear_local_state_on_exit_ &&
       BrowserThread::CurrentlyOn(BrowserThread::WEBKIT)) {
@@ skipping 62 matching lines @@
   StorageNamespaceMap::iterator iter = storage_namespace_map_.find(id);
   if (iter != storage_namespace_map_.end())
     return iter->second;
   if (!allocation_allowed)
     return NULL;
   if (id == kLocalStorageNamespaceId)
     return CreateLocalStorage();
   return CreateSessionStorage(id);
 }
 
-void DOMStorageContext::RegisterDispatcherHost(
-    DOMStorageDispatcherHost* dispatcher_host) {
+void DOMStorageContext::RegisterMessageFilter(
+    DOMStorageMessageFilter* message_filter) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
-  DCHECK(dispatcher_host_set_.find(dispatcher_host) ==
-         dispatcher_host_set_.end());
-  dispatcher_host_set_.insert(dispatcher_host);
+  DCHECK(message_filter_set_.find(message_filter) ==
+         message_filter_set_.end());
+  message_filter_set_.insert(message_filter);
 }
 
-void DOMStorageContext::UnregisterDispatcherHost(
-    DOMStorageDispatcherHost* dispatcher_host) {
+void DOMStorageContext::UnregisterMessageFilter(
+    DOMStorageMessageFilter* message_filter) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
-  DCHECK(dispatcher_host_set_.find(dispatcher_host) !=
-         dispatcher_host_set_.end());
-  dispatcher_host_set_.erase(dispatcher_host);
+  DCHECK(message_filter_set_.find(message_filter) !=
+         message_filter_set_.end());
+  message_filter_set_.erase(message_filter);
 }
 
-const DOMStorageContext::DispatcherHostSet*
-DOMStorageContext::GetDispatcherHostSet() const {
+const DOMStorageContext::MessageFilterSet*
+DOMStorageContext::GetMessageFilterSet() const {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
-  return &dispatcher_host_set_;
+  return &message_filter_set_;
 }
 
 void DOMStorageContext::PurgeMemory() {
   // It is only safe to purge the memory from the LocalStorage namespace,
   // because it is backed by disk and can be reloaded later.  If we purge a
   // SessionStorage namespace, its data will be gone forever, because it isn't
   // currently backed by disk.
   DOMStorageNamespace* local_storage =
       GetStorageNamespace(kLocalStorageNamespaceId, false);
   if (local_storage)
@@ skipping 106 matching lines @@
 }
 
 FilePath DOMStorageContext::GetLocalStorageFilePath(
     const string16& origin_id) const {
   FilePath storageDir = data_path_.Append(
       DOMStorageContext::kLocalStorageDirectory);
   FilePath::StringType id =
       webkit_glue::WebStringToFilePathString(origin_id);
   return storageDir.Append(id.append(kLocalStorageExtension));
 }