Get rid of MessageLoop* caching in extensions code.

chrome/browser/extensions/extension_message_service.cc

 // Copyright (c) 2009 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/extensions/extension_message_service.h"
 
 #include "base/json/json_writer.h"
 #include "base/singleton.h"
 #include "base/stl_util-inl.h"
 #include "base/values.h"
@@ skipping 94 matching lines @@
 const char ExtensionMessageService::kDispatchOnConnect[] =
     "Port.dispatchOnConnect";
 const char ExtensionMessageService::kDispatchOnDisconnect[] =
     "Port.dispatchOnDisconnect";
 const char ExtensionMessageService::kDispatchOnMessage[] =
     "Port.dispatchOnMessage";
 const char ExtensionMessageService::kDispatchEvent[] =
     "Event.dispatchJSON";
 
 ExtensionMessageService::ExtensionMessageService(Profile* profile)
-    : ui_loop_(MessageLoop::current()),
-      profile_(profile),
+    : profile_(profile),
       extension_devtools_manager_(NULL),
       next_port_id_(0) {
-  DCHECK_EQ(ui_loop_->type(), MessageLoop::TYPE_UI);
-
   registrar_.Add(this, NotificationType::RENDERER_PROCESS_TERMINATED,
                  NotificationService::AllSources());
   registrar_.Add(this, NotificationType::RENDERER_PROCESS_CLOSED,
                  NotificationService::AllSources());
   registrar_.Add(this, NotificationType::RENDER_VIEW_HOST_DELETED,
                  NotificationService::AllSources());
 
   extension_devtools_manager_ = profile_->GetExtensionDevToolsManager();
 }
 
 ExtensionMessageService::~ExtensionMessageService() {
 }
 
 void ExtensionMessageService::ProfileDestroyed() {
-  DCHECK_EQ(ui_loop_->type(), MessageLoop::TYPE_UI);
-
   profile_ = NULL;
 
   // We remove notifications here because our destructor might be called on
   // a non-UI thread.
   registrar_.RemoveAll();
 }
 
 void ExtensionMessageService::AddEventListener(const std::string& event_name,
                                                int render_process_id) {
   DCHECK(RenderProcessHost::FromID(render_process_id)) <<
@@ skipping 53 matching lines @@
     const std::string& channel_name, ResourceMessageFilter* source) {
   DCHECK(ChromeThread::CurrentlyOn(ChromeThread::IO));
 
   // Create a channel ID for both sides of the channel.
   int port1_id = -1;
   int port2_id = -1;
   AllocatePortIdPair(&port1_id, &port2_id);
 
   // Each side of the port is given his own port ID.  When they send messages,
   // we convert to the opposite port ID.  See PostMessageFromRenderer.
-  ui_loop_->PostTask(FROM_HERE,
-      NewRunnableMethod(this,
-          &ExtensionMessageService::OpenChannelToExtensionOnUIThread,
+  ChromeThread::PostTask(
+      ChromeThread::UI, FROM_HERE,
+      NewRunnableMethod(
+          this, &ExtensionMessageService::OpenChannelToExtensionOnUIThread,
           source->id(), routing_id, port2_id, source_extension_id,
           target_extension_id, channel_name));
 
   return port1_id;
 }
 
 int ExtensionMessageService::OpenChannelToTab(int routing_id,
                                               int tab_id,
                                               const std::string& extension_id,
                                               const std::string& channel_name,
                                               ResourceMessageFilter* source) {
   DCHECK(ChromeThread::CurrentlyOn(ChromeThread::IO));
 
   // Create a channel ID for both sides of the channel.
   int port1_id = -1;
   int port2_id = -1;
   AllocatePortIdPair(&port1_id, &port2_id);
 
   // Each side of the port is given his own port ID.  When they send messages,
   // we convert to the opposite port ID.  See PostMessageFromRenderer.
-  ui_loop_->PostTask(FROM_HERE,
-      NewRunnableMethod(this,
-          &ExtensionMessageService::OpenChannelToTabOnUIThread,
+  ChromeThread::PostTask(
+      ChromeThread::UI, FROM_HERE,
+      NewRunnableMethod(
+          this, &ExtensionMessageService::OpenChannelToTabOnUIThread,
           source->id(), routing_id, port2_id, tab_id, extension_id,
           channel_name));
 
   return port1_id;
 }
 
 void ExtensionMessageService::OpenChannelToExtensionOnUIThread(
     int source_process_id, int source_routing_id, int receiver_port_id,
     const std::string& source_extension_id,
     const std::string& target_extension_id,
@@ skipping 260 matching lines @@
 
     if (current->second->opener.sender == sender) {
       CloseChannelImpl(current, GET_CHANNEL_OPENER_ID(current->first),
                        notify_other_port);
     } else if (current->second->receiver.sender == sender) {
       CloseChannelImpl(current, GET_CHANNEL_RECEIVERS_ID(current->first),
                        notify_other_port);
     }
   }
 }