Fixing 27834 by always deleting ExtensionMessageService on...

chrome/browser/extensions/extension_message_service.h

 // 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.
 
 #ifndef CHROME_BROWSER_EXTENSIONS_EXTENSION_MESSAGE_SERVICE_H_
 #define CHROME_BROWSER_EXTENSIONS_EXTENSION_MESSAGE_SERVICE_H_
 
 #include <map>
 #include <set>
 #include <string>
 
 #include "base/lock.h"
 #include "base/ref_counted.h"
 #include "chrome/common/notification_registrar.h"
+#include "chrome/browser/chrome_thread.h"
 #include "chrome/browser/extensions/extension_devtools_manager.h"
 #include "ipc/ipc_message.h"
 
 class MessageLoop;
 class Profile;
 class RenderProcessHost;
 class ResourceMessageFilter;
 class TabContents;
 class URLRequestContext;
 
@@ skipping 12 matching lines @@
 // - Once the channel is established, either side can call postMessage to send
 // a message to the opposite side of the channel, which may have multiple
 // listeners.
 //
 // Terminology:
 // channel: connection between two ports
 // port: an IPC::Message::Sender interface and an optional routing_id (in the
 // case that the port is a tab).  The Sender is usually either a
 // RenderProcessHost or a RenderViewHost.
 class ExtensionMessageService
-    : public base::RefCountedThreadSafe<ExtensionMessageService>,
+    : public base::RefCountedThreadSafe<
+          ExtensionMessageService, ChromeThread::DeleteOnUIThread>,
       public NotificationObserver {
  public:
   // Javascript function name constants.
   static const char kDispatchOnConnect[];
   static const char kDispatchOnDisconnect[];
   static const char kDispatchOnMessage[];
   static const char kDispatchEvent[];
   static const char kDispatchError[];
 
   // A messaging channel.  Note that the opening port can be the same as the
@@ skipping 62 matching lines @@
 
   // Same as above, but opens a channel to the tab with the given ID.  Messages
   // are restricted to that tab, so if there are multiple tabs in that process,
   // only the targeted tab will receive messages.
   int OpenChannelToTab(int routing_id, int tab_id,
                        const std::string& extension_id,
                        const std::string& channel_name,
                        ResourceMessageFilter* source);
 
  private:
-  friend class base::RefCountedThreadSafe<ExtensionMessageService>;
+  friend class ChromeThread;
+  friend class DeleteTask<ExtensionMessageService>;
 
   // A map of channel ID to its channel object.
   typedef std::map<int, MessageChannel*> MessageChannelMap;
 
   ~ExtensionMessageService();
 
   // Allocates a pair of port ids.
   // NOTE: this can be called from any thread.
   void AllocatePortIdPair(int* port1, int* port2);
 
@@ skipping 47 matching lines @@
 
   // --- UI or IO thread:
 
   // For generating unique channel IDs.
   int next_port_id_;
 
   // Protects the next_port_id_ variable, since it can be
   // used on the IO thread or the UI thread.
   Lock next_port_id_lock_;
 
+  // The thread creating this object. Should be UI thread.
+  ChromeThread::ID thread_id_;
+
   DISALLOW_COPY_AND_ASSIGN(ExtensionMessageService);
 };
 
 #endif  // CHROME_BROWSER_EXTENSIONS_EXTENSION_MESSAGE_SERVICE_H_