Change MessageService to use ProfileKeyedAPI.

chrome/browser/extensions/api/messaging/message_service.h

 // Copyright (c) 2012 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_API_MESSAGING_MESSAGE_SERVICE_H_
 #define CHROME_BROWSER_EXTENSIONS_API_MESSAGING_MESSAGE_SERVICE_H_
 
 #include <map>
 #include <set>
 #include <string>
 
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "chrome/browser/extensions/api/messaging/native_message_process_host.h"
+#include "chrome/browser/extensions/api/profile_keyed_api_factory.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 
 class GURL;
 class Profile;
 
 namespace base {
 class DictionaryValue;
 }
 
@@ skipping 21 matching lines @@
 // context owned by the connecting extension in that process/tab.
 // - 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::Process interface and an optional routing_id (in the
 // case that the port is a tab).  The Process is usually either a
 // RenderProcessHost or a RenderViewHost.
-class MessageService : public content::NotificationObserver,
+class MessageService : public ProfileKeyedAPI,
+                       public content::NotificationObserver,
                        public NativeMessageProcessHost::Client {
  public:
   // A messaging channel. Note that the opening port can be the same as the
   // receiver, if an extension background page wants to talk to its tab (for
   // example).
   struct MessageChannel;
 
   // One side of the communication handled by extensions::MessageService.
   class MessagePort {
    public:
@@ skipping 27 matching lines @@
     MessagePort() {}
 
    private:
     DISALLOW_COPY_AND_ASSIGN(MessagePort);
   };
 
   // Allocates a pair of port ids.
   // NOTE: this can be called from any thread.
   static void AllocatePortIdPair(int* port1, int* port2);
 
-  explicit MessageService(LazyBackgroundTaskQueue* queue);
+  explicit MessageService(Profile* profile);
   virtual ~MessageService();
 
+  // ProfileKeyedAPI implementation.
+  static ProfileKeyedAPIFactory<MessageService>* GetFactoryInstance();
+
+  // Convenience method to get the MessageService for a profile.
+  static MessageService* Get(Profile* profile);
+
   // Given an extension's ID, opens a channel between the given renderer "port"
   // and every listening context owned by that extension. |channel_name| is
   // an optional identifier for use by extension developers.
   void OpenChannelToExtension(
       int source_process_id, int source_routing_id, int receiver_port_id,
       const std::string& source_extension_id,
       const std::string& target_extension_id,
       const GURL& source_url,
       const std::string& channel_name);
 
@@ skipping 20 matching lines @@
   // Sends a message to the given port.
   void PostMessage(int port_id, const std::string& message);
 
   // NativeMessageProcessHost::Client
   virtual void PostMessageFromNativeProcess(
       int port_id,
       const std::string& message) OVERRIDE;
 
  private:
   friend class MockMessageService;
+  friend class ProfileKeyedAPIFactory<MessageService>;
   struct OpenChannelParams;
 
   // A map of channel ID to its channel object.
   typedef std::map<int, MessageChannel*> MessageChannelMap;
 
   // A map of channel ID to information about the extension that is waiting
   // for that channel to open. Used for lazy background pages.
   typedef std::string ExtensionID;
   typedef std::pair<Profile*, ExtensionID> PendingChannel;
   typedef std::map<int, PendingChannel> PendingChannelMap;
@@ skipping 37 matching lines @@
     if (host)
       CloseChannel(port_id, error_message);
   }
   void PendingPostMessage(int port_id,
                           const std::string& message,
                           extensions::ExtensionHost* host) {
     if (host)
       PostMessage(port_id, message);
   }
 
+  Profile* profile_;
+
+  // ProfileKeyedAPI implementation.

[Yoyo Zhou, 2013/04/30 22:33:04]

Should also be redirected in incognito.

[Patrick Riordan, 2013/05/01 01:54:44]

Done.

+  static const char* service_name() {
+    return "MessageService";
+  }
+
   content::NotificationRegistrar registrar_;
   MessageChannelMap channels_;
   PendingChannelMap pending_channels_;
 
   // Weak pointer. Guaranteed to outlive this class.
   LazyBackgroundTaskQueue* lazy_background_task_queue_;
 
   base::WeakPtrFactory<MessageService> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(MessageService);
 };
 
 }  // namespace extensions
 
 #endif  // CHROME_BROWSER_EXTENSIONS_API_MESSAGING_MESSAGE_SERVICE_H_