Change many extension event routers to not be singletons and to be more profile-aware.

chrome/browser/extensions/extension_cookies_api.h

 // Copyright (c) 2011 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.
 
 // Defines the Chrome Extensions Cookies API functions for accessing internet
 // cookies, as specified in chrome/common/extensions/api/extension_api.json.
 
 #ifndef CHROME_BROWSER_EXTENSIONS_EXTENSION_COOKIES_API_H_
 #define CHROME_BROWSER_EXTENSIONS_EXTENSION_COOKIES_API_H_
 #pragma once
 
 #include <string>
 
 #include "base/memory/ref_counted.h"
-#include "base/memory/singleton.h"
 #include "base/time.h"
 #include "chrome/browser/extensions/extension_function.h"
 #include "chrome/browser/net/chrome_cookie_notification_details.h"
 #include "content/common/notification_observer.h"
 #include "content/common/notification_registrar.h"
 #include "googleurl/src/gurl.h"
 #include "net/base/cookie_monster.h"
 
 class DictionaryValue;
 
 namespace net {
 class URLRequestContextGetter;
 }
 
 // Observes CookieMonster notifications and routes them as events to the
 // extension system.
 class ExtensionCookiesEventRouter : public NotificationObserver {
  public:
-  // Single instance of the event router.
-  static ExtensionCookiesEventRouter* GetInstance();
+  explicit ExtensionCookiesEventRouter();
+  virtual ~ExtensionCookiesEventRouter();
 
-  void Init();
+  void ObserveProfile(Profile* profile);
 
  private:
-  friend struct DefaultSingletonTraits<ExtensionCookiesEventRouter>;
-
-  ExtensionCookiesEventRouter() {}
-  virtual ~ExtensionCookiesEventRouter() {}
-
   // NotificationObserver implementation.
   virtual void Observe(NotificationType type,
                        const NotificationSource& source,
                        const NotificationDetails& details);
 
   // Handler for the COOKIE_CHANGED event. The method takes the details of such
   // an event and constructs a suitable JSON formatted extension event from it.
   void CookieChanged(Profile* profile,
                      ChromeCookieDetails* details);
 
@@ skipping 121 matching lines @@
 // Implements the cookies.getAllCookieStores() extension function.
 class GetAllCookieStoresFunction : public CookiesFunction {
  public:
   virtual bool RunImpl();
   // GetAllCookieStoresFunction is sync.
   virtual void Run();
   DECLARE_EXTENSION_FUNCTION_NAME("cookies.getAllCookieStores")
 };
 
 #endif  // CHROME_BROWSER_EXTENSIONS_EXTENSION_COOKIES_API_H_