Clean up how we handle themes in the extensions system and management API....

chrome/browser/extensions/extension_management_api.h

 // Copyright (c) 2010 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_MANAGEMENT_API_H__
 #define CHROME_BROWSER_EXTENSIONS_EXTENSION_MANAGEMENT_API_H__
 #pragma once
 
-#include "base/singleton.h"
 #include "chrome/browser/extensions/extension_function.h"
 #include "chrome/common/notification_observer.h"
 #include "chrome/common/notification_registrar.h"
 
 class ExtensionService;
 
 class ExtensionManagementFunction : public SyncExtensionFunction {
  protected:
   ExtensionService* service();
 };
@@ skipping 23 matching lines @@
 };
 
 class UninstallFunction : public ExtensionManagementFunction {
   ~UninstallFunction() {}
   virtual bool RunImpl();
   DECLARE_EXTENSION_FUNCTION_NAME("management.uninstall");
 };
 
 class ExtensionManagementEventRouter : public NotificationObserver {
  public:
-  // Get the singleton instance of the event router.
-  static ExtensionManagementEventRouter* GetInstance();
+  ExtensionManagementEventRouter();
+  virtual ~ExtensionManagementEventRouter();
 
-  // Performs one-time initialization of our singleton.
+  // Performs one-time initialization.
   void Init();
 
  private:
-  friend struct DefaultSingletonTraits<ExtensionManagementEventRouter>;
-
-  ExtensionManagementEventRouter();
-  virtual ~ExtensionManagementEventRouter();
-
   // NotificationObserver implementation.
   virtual void Observe(NotificationType type,
                        const NotificationSource& source,
                        const NotificationDetails& details);
 
   NotificationRegistrar registrar_;
 
   DISALLOW_COPY_AND_ASSIGN(ExtensionManagementEventRouter);
 };
 
 #endif  // CHROME_BROWSER_EXTENSIONS_EXTENSION_MANAGEMENT_API_H__