Revert 18765 to try to repair perf regression

TBR=mpcomplete
Review URL: http://codereview.chromium.org/131093

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@18784 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 10 insertions, 14 deletions

diff --git a/chrome/browser/renderer_host/browser_render_process_host.cc b/chrome/browser/renderer_host/browser_render_process_host.cc
index 2f0d07a..06405ed 100644
--- a/chrome/browser/renderer_host/browser_render_process_host.cc
+++ b/chrome/browser/renderer_host/browser_render_process_host.cc
@@ -641,8 +641,6 @@ void BrowserRenderProcessHost::OnMessageReceived(const IPC::Message& msg) {
                           OnExtensionAddListener)
       IPC_MESSAGE_HANDLER(ViewHostMsg_ExtensionRemoveListener,
                           OnExtensionRemoveListener)
-      IPC_MESSAGE_HANDLER(ViewHostMsg_ExtensionCloseChannel,
-                          OnExtensionCloseChannel)
       IPC_MESSAGE_UNHANDLED_ERROR()
     IPC_END_MESSAGE_MAP_EX()
 
@@ -859,17 +857,14 @@ void BrowserRenderProcessHost::Observe(NotificationType type,
 
 void BrowserRenderProcessHost::OnExtensionAddListener(
     const std::string& event_name) {
-  ExtensionMessageService::GetInstance(profile()->GetRequestContext())->
-      AddEventListener(event_name, pid());
+  URLRequestContext* context = profile()->GetRequestContext();
+  ExtensionMessageService* ems = ExtensionMessageService::GetInstance(context);
+  ems->AddEventListener(event_name, pid());
 }
 
 void BrowserRenderProcessHost::OnExtensionRemoveListener(
     const std::string& event_name) {
-  ExtensionMessageService::GetInstance(profile()->GetRequestContext())->
-      RemoveEventListener(event_name, pid());
-}
-
-void BrowserRenderProcessHost::OnExtensionCloseChannel(int port_id) {
-  ExtensionMessageService::GetInstance(profile()->GetRequestContext())->
-      CloseChannel(port_id);
+  URLRequestContext* context = profile()->GetRequestContext();
+  ExtensionMessageService* ems = ExtensionMessageService::GetInstance(context);
+  ems->RemoveEventListener(event_name, pid());
 }
diff --git a/chrome/browser/renderer_host/browser_render_process_host.h b/chrome/browser/renderer_host/browser_render_process_host.h
index 2fd0d05..6c259f0 100644
--- a/chrome/browser/renderer_host/browser_render_process_host.h
+++ b/chrome/browser/renderer_host/browser_render_process_host.h
@@ -86,15 +86,16 @@ class BrowserRenderProcessHost : public RenderProcessHost,
                        const NotificationSource& source,
                        const NotificationDetails& details);
 
+  // An extension process started or stopped listening to an event.
+  void OnExtensionAddListener(const std::string& event_name);
+  void OnExtensionRemoveListener(const std::string& event_name);
+
  private:
   // Control message handlers.
   void OnPageContents(const GURL& url, int32 page_id,
                       const std::wstring& contents);
   void OnUpdatedCacheStats(const WebKit::WebCache::UsageStats& stats);
   void SuddenTerminationChanged(bool enabled);
-  void OnExtensionAddListener(const std::string& event_name);
-  void OnExtensionRemoveListener(const std::string& event_name);
-  void OnExtensionCloseChannel(int port_id);
 
   // Initialize support for visited links. Send the renderer process its initial
   // set of visited links.