Remove deprecated extension notifications and

Use ExtensionRegistry instead from file_system, location, management apis.
and Use content:BrowserContext instead of Profile.
and Remove unwanted extensions:: namespace prefix from management api.

TEST=browser_tests --gtest_filter=FileSystemApiTest.*
R=rdevlin.cronin@chromium.org
BUG=354046

Review URL: https://codereview.chromium.org/330383003

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

chrome/browser/extensions/api/file_system/file_system_apitest.cc

@@ -5,41 +5,42 @@
 #include "apps/saved_files_service.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
+#include "base/scoped_observer.h"
 #include "build/build_config.h"
 #include "chrome/browser/apps/app_browsertest_util.h"
-#include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/extensions/api/file_system/file_system_api.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/chrome_paths.h"
-#include "content/public/browser/notification_observer.h"
-#include "content/public/browser/notification_service.h"
 #include "extensions/browser/extension_prefs.h"
+#include "extensions/browser/extension_registry.h"
+#include "extensions/browser/extension_registry_observer.h"
+
+namespace content {
+class BrowserContext;
+}
 
 namespace extensions {
 
 namespace {
 
-class AppInstallObserver : public content::NotificationObserver {
+class AppLoadObserver : public ExtensionRegistryObserver {
  public:
-  AppInstallObserver(
-      base::Callback<void(const Extension*)> callback)
-      : callback_(callback) {
-    registrar_.Add(this,
-                   chrome::NOTIFICATION_EXTENSION_LOADED_DEPRECATED,
-                   content::NotificationService::AllSources());
+  AppLoadObserver(content::BrowserContext* browser_context,
+                  base::Callback<void(const Extension*)> callback)
+      : callback_(callback), extension_registry_observer_(this) {
+    extension_registry_observer_.Add(ExtensionRegistry::Get(browser_context));
   }
 
-  virtual void Observe(int type,
-                       const content::NotificationSource& source,
-                       const content::NotificationDetails& details) OVERRIDE {
-    EXPECT_EQ(chrome::NOTIFICATION_EXTENSION_LOADED_DEPRECATED, type);
-    callback_.Run(content::Details<const Extension>(details).ptr());
+  virtual void OnExtensionLoaded(content::BrowserContext* browser_context,
+                                 const Extension* extension) OVERRIDE {
+    callback_.Run(extension);
   }
 
  private:
-  content::NotificationRegistrar registrar_;
   base::Callback<void(const Extension*)> callback_;
-  DISALLOW_COPY_AND_ASSIGN(AppInstallObserver);
+  ScopedObserver<ExtensionRegistry, ExtensionRegistryObserver>
+      extension_registry_observer_;
+  DISALLOW_COPY_AND_ASSIGN(AppLoadObserver);
 };
 
 void SetLastChooseEntryDirectory(const base::FilePath& choose_entry_directory,
@@ -197,10 +198,10 @@ IN_PROC_BROWSER_TEST_F(FileSystemApiTest,
   FileSystemChooseEntryFunction::
       SkipPickerAndSelectSuggestedPathForTest();
   {
-    AppInstallObserver observer(
-        base::Bind(SetLastChooseEntryDirectory,
-                   test_file.DirName(),
-                   ExtensionPrefs::Get(profile())));
+    AppLoadObserver observer(profile(),
+                             base::Bind(SetLastChooseEntryDirectory,
+                                        test_file.DirName(),
+                                        ExtensionPrefs::Get(profile())));
     ASSERT_TRUE(RunPlatformAppTest("api_test/file_system/open_existing"))
         << message_;
   }
@@ -216,11 +217,12 @@ IN_PROC_BROWSER_TEST_F(FileSystemApiTest,
   FileSystemChooseEntryFunction::
       SkipPickerAndSelectSuggestedPathForTest();
   {
-    AppInstallObserver observer(base::Bind(
-        SetLastChooseEntryDirectory,
-        test_file.DirName().Append(
-            base::FilePath::FromUTF8Unsafe("fake_directory_does_not_exist")),
-        ExtensionPrefs::Get(profile())));
+    AppLoadObserver observer(
+        profile(),
+        base::Bind(SetLastChooseEntryDirectory,
+                   test_file.DirName().Append(base::FilePath::FromUTF8Unsafe(
+                       "fake_directory_does_not_exist")),
+                   ExtensionPrefs::Get(profile())));
     ASSERT_TRUE(RunPlatformAppTest("api_test/file_system/open_existing"))
         << message_;
   }
@@ -608,11 +610,11 @@ IN_PROC_BROWSER_TEST_F(FileSystemApiTest, FileSystemApiRestoreEntry) {
   ASSERT_FALSE(test_file.empty());
   FileSystemChooseEntryFunction::SkipPickerAndAlwaysSelectPathForTest(
       &test_file);
-  AppInstallObserver observer(
-      base::Bind(AddSavedEntry,
-                 test_file,
-                 false,
-                 apps::SavedFilesService::Get(profile())));
+  AppLoadObserver observer(profile(),
+                           base::Bind(AddSavedEntry,
+                                      test_file,
+                                      false,
+                                      apps::SavedFilesService::Get(profile())));
   ASSERT_TRUE(RunPlatformAppTest("api_test/file_system/restore_entry"))
       << message_;
 }
@@ -623,11 +625,11 @@ IN_PROC_BROWSER_TEST_F(FileSystemApiTest, FileSystemApiRestoreDirectoryEntry) {
   base::FilePath test_directory = test_file.DirName();
   FileSystemChooseEntryFunction::SkipPickerAndAlwaysSelectPathForTest(
       &test_file);
-  AppInstallObserver observer(
-      base::Bind(AddSavedEntry,
-                 test_directory,
-                 true,
-                 apps::SavedFilesService::Get(profile())));
+  AppLoadObserver observer(profile(),
+                           base::Bind(AddSavedEntry,
+                                      test_directory,
+                                      true,
+                                      apps::SavedFilesService::Get(profile())));
   ASSERT_TRUE(RunPlatformAppTest("api_test/file_system/restore_directory"))
       << message_;
 }

chrome/browser/extensions/api/location/location_api.cc

@@ -5,7 +5,6 @@
 #include "chrome/browser/extensions/api/location/location_api.h"
 
 #include "chrome/browser/extensions/api/location/location_manager.h"
-#include "chrome/browser/profiles/profile.h"
 #include "chrome/common/extensions/api/location.h"
 #include "extensions/common/error_utils.h"
 
@@ -49,7 +48,7 @@ bool LocationWatchLocationFunction::RunSync() {
   }
 
   // TODO(vadimt): validate and use params->request_info.maximumAge
-  LocationManager::Get(GetProfile())
+  LocationManager::Get(browser_context())
       ->AddLocationRequest(extension_id(),
                            params->name,
                            min_distance_in_meters,
@@ -63,7 +62,7 @@ bool LocationClearWatchFunction::RunSync() {
       ClearWatch::Params::Create(*args_));
   EXTENSION_FUNCTION_VALIDATE(params.get());
 
-  LocationManager::Get(GetProfile())
+  LocationManager::Get(browser_context())
       ->RemoveLocationRequest(extension_id(), params->name);
 
   return true;

chrome/browser/extensions/api/location/location_manager.cc

@@ -10,15 +10,12 @@
 #include "base/bind.h"
 #include "base/lazy_instance.h"
 #include "base/time/time.h"
-#include "chrome/browser/chrome_notification_types.h"
-#include "chrome/browser/profiles/profile.h"
 #include "chrome/common/extensions/api/location.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/geolocation_provider.h"
-#include "content/public/browser/notification_details.h"
-#include "content/public/browser/notification_source.h"
 #include "content/public/common/geoposition.h"
 #include "extensions/browser/event_router.h"
+#include "extensions/browser/extension_registry.h"
 #include "extensions/browser/extension_system.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/permissions/permission_set.h"
@@ -248,12 +245,8 @@ void LocationRequest::OnPositionReported(const content::Geoposition& position) {
 }
 
 LocationManager::LocationManager(content::BrowserContext* context)
-    : profile_(Profile::FromBrowserContext(context)) {
-  registrar_.Add(this,
-                 chrome::NOTIFICATION_EXTENSION_LOADED_DEPRECATED,
-                 content::Source<Profile>(profile_));
-  registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_UNLOADED_DEPRECATED,
-                 content::Source<Profile>(profile_));
+    : browser_context_(context), extension_registry_observer_(this) {
+  extension_registry_observer_.Add(ExtensionRegistry::Get(browser_context_));
 }
 
 void LocationManager::AddLocationRequest(
@@ -343,42 +336,30 @@ void LocationManager::SendLocationUpdate(
 
   scoped_ptr<Event> event(new Event(event_name, args.Pass()));
 
-  EventRouter::Get(profile_)
+  EventRouter::Get(browser_context_)
       ->DispatchEventToExtension(extension_id, event.Pass());
 }
 
-void LocationManager::Observe(int type,
-                              const content::NotificationSource& source,
-                              const content::NotificationDetails& details) {
-  DCHECK_CURRENTLY_ON(BrowserThread::UI);
-
-  switch (type) {
-    case chrome::NOTIFICATION_EXTENSION_LOADED_DEPRECATED: {
-      // Grants permission to use geolocation once an extension with "location"
-      // permission is loaded.
-      const Extension* extension =
-          content::Details<const Extension>(details).ptr();
-
-      if (extension->permissions_data()->HasAPIPermission(
-              APIPermission::kLocation)) {
-          content::GeolocationProvider::GetInstance()->
-              UserDidOptIntoLocationServices();
-      }
-      break;
-    }
-    case chrome::NOTIFICATION_EXTENSION_UNLOADED_DEPRECATED: {
-      // Delete all requests from the unloaded extension.
-      const Extension* extension =
-          content::Details<const UnloadedExtensionInfo>(details)->extension;
-      location_requests_.erase(extension->id());
-      break;
-    }
-    default:
-      NOTREACHED();
-      break;
+void LocationManager::OnExtensionLoaded(
+    content::BrowserContext* browser_context,
+    const Extension* extension) {
+  // Grants permission to use geolocation once an extension with "location"
+  // permission is loaded.
+  if (extension->permissions_data()->HasAPIPermission(
+          APIPermission::kLocation)) {
+    content::GeolocationProvider::GetInstance()
+        ->UserDidOptIntoLocationServices();
   }
 }
 
+void LocationManager::OnExtensionUnloaded(
+    content::BrowserContext* browser_context,
+    const Extension* extension,
+    UnloadedExtensionInfo::Reason reason) {
+  // Delete all requests from the unloaded extension.
+  location_requests_.erase(extension->id());
+}
+
 static base::LazyInstance<BrowserContextKeyedAPIFactory<LocationManager> >
     g_factory = LAZY_INSTANCE_INITIALIZER;
 
@@ -388,7 +369,7 @@ LocationManager::GetFactoryInstance() {
   return g_factory.Pointer();
 }
 
- // static
+// static
 LocationManager* LocationManager::Get(content::BrowserContext* context) {
   return BrowserContextKeyedAPIFactory<LocationManager>::Get(context);
 }

chrome/browser/extensions/api/location/location_manager.h

@@ -5,14 +5,11 @@
 #ifndef CHROME_BROWSER_EXTENSIONS_API_LOCATION_LOCATION_MANAGER_H_
 #define CHROME_BROWSER_EXTENSIONS_API_LOCATION_LOCATION_MANAGER_H_
 
-#include <map>
 #include <string>
 
-#include "content/public/browser/notification_observer.h"
-#include "content/public/browser/notification_registrar.h"
+#include "base/scoped_observer.h"
 #include "extensions/browser/browser_context_keyed_api_factory.h"
-
-class Profile;
+#include "extensions/browser/extension_registry_observer.h"
 
 namespace content {
 class BrowserContext;
@@ -20,6 +17,7 @@ struct Geoposition;
 }  // namespace content
 
 namespace extensions {
+class ExtensionRegistry;
 class LocationManager;
 class LocationRequest;
 
@@ -31,10 +29,10 @@ struct Coordinates;
 }  // namespace location
 }  // namespace api
 
-// Profile's manager of all location watch requests created by chrome.location
-// API. Lives in the UI thread.
+// BrowserContext's manager of all location watch requests created by
+// chrome.location API. Lives in the UI thread.
 class LocationManager : public BrowserContextKeyedAPI,
-                        public content::NotificationObserver {
+                        public ExtensionRegistryObserver {
  public:
   explicit LocationManager(content::BrowserContext* context);
   virtual ~LocationManager();
@@ -55,7 +53,7 @@ class LocationManager : public BrowserContextKeyedAPI,
   // BrowserContextKeyedAPI implementation.
   static BrowserContextKeyedAPIFactory<LocationManager>* GetFactoryInstance();
 
-  // Convenience method to get the LocationManager for a profile.
+  // Convenience method to get the LocationManager for a context.
   static LocationManager* Get(content::BrowserContext* context);
 
  private:
@@ -78,23 +76,25 @@ class LocationManager : public BrowserContextKeyedAPI,
                           const std::string& request_name,
                           const content::Geoposition& position);
 
-  // NotificationObserver:
-  virtual void Observe(int type,
-                       const content::NotificationSource& source,
-                       const content::NotificationDetails& details) OVERRIDE;
+  // ExtensionRegistryObserver implementation.
+  virtual void OnExtensionLoaded(content::BrowserContext* browser_context,
+                                 const Extension* extension) OVERRIDE;
+  virtual void OnExtensionUnloaded(
+      content::BrowserContext* browser_context,
+      const Extension* extension,
+      UnloadedExtensionInfo::Reason reason) OVERRIDE;
 
   // BrowserContextKeyedAPI implementation.
   static const char* service_name() { return "LocationManager"; }
 
-  // Profile for this location manager.
-  Profile* const profile_;
+  content::BrowserContext* const browser_context_;
 
   // A map of our pending location requests, per extension.
   // Invariant: None of the LocationRequestLists are empty.
   LocationRequestMap location_requests_;
 
-  // Used for tracking registrations to profile's extensions events.
-  content::NotificationRegistrar registrar_;
+  ScopedObserver<ExtensionRegistry, ExtensionRegistryObserver>
+      extension_registry_observer_;
 
   DISALLOW_COPY_AND_ASSIGN(LocationManager);
 };

chrome/browser/extensions/api/management/management_api.cc

@@ -4,7 +4,6 @@
 
 #include "chrome/browser/extensions/api/management/management_api.h"
 
-#include <map>
 #include <string>
 #include <vector>
 
@@ -19,7 +18,6 @@
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
-#include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/extensions/api/management/management_api_constants.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_ui_util.h"
@@ -38,8 +36,6 @@
 #include "chrome/common/extensions/extension_constants.h"
 #include "chrome/common/extensions/manifest_handlers/app_launch_info.h"
 #include "chrome/common/extensions/manifest_url_handler.h"
-#include "content/public/browser/notification_details.h"
-#include "content/public/browser/notification_source.h"
 #include "content/public/browser/utility_process_host.h"
 #include "content/public/browser/utility_process_host_client.h"
 #include "extensions/browser/event_router.h"
@@ -859,7 +855,7 @@ ManagementGenerateAppForLinkFunction::~ManagementGenerateAppForLinkFunction() {
 }
 
 void ManagementGenerateAppForLinkFunction::FinishCreateBookmarkApp(
-    const extensions::Extension* extension,
+    const Extension* extension,
     const WebApplicationInfo& web_app_info) {
   if (extension) {
     scoped_ptr<management::ExtensionInfo> info =
@@ -937,73 +933,53 @@ bool ManagementGenerateAppForLinkFunction::RunAsync() {
   return true;
 }
 
-ManagementEventRouter::ManagementEventRouter(Profile* profile)
-    : profile_(profile) {
-  int types[] = {chrome::NOTIFICATION_EXTENSION_INSTALLED_DEPRECATED,
-                 chrome::NOTIFICATION_EXTENSION_UNINSTALLED_DEPRECATED,
-                 chrome::NOTIFICATION_EXTENSION_LOADED_DEPRECATED,
-                 chrome::NOTIFICATION_EXTENSION_UNLOADED_DEPRECATED};
-
-  CHECK(registrar_.IsEmpty());
-  for (size_t i = 0; i < arraysize(types); i++) {
-    registrar_.Add(this,
-                   types[i],
-                   content::Source<Profile>(profile_));
-  }
+ManagementEventRouter::ManagementEventRouter(content::BrowserContext* context)
+    : browser_context_(context), extension_registry_observer_(this) {
+  extension_registry_observer_.Add(ExtensionRegistry::Get(browser_context_));
 }
 
 ManagementEventRouter::~ManagementEventRouter() {}
 
-void ManagementEventRouter::Observe(
-    int type,
-    const content::NotificationSource& source,
-    const content::NotificationDetails& details) {
-  const char* event_name = NULL;
-  const Extension* extension = NULL;
-  Profile* profile = content::Source<Profile>(source).ptr();
-  CHECK(profile);
-  CHECK(profile_->IsSameProfile(profile));
-
-  switch (type) {
-    case chrome::NOTIFICATION_EXTENSION_INSTALLED_DEPRECATED:
-      event_name = management::OnInstalled::kEventName;
-      extension =
-          content::Details<const InstalledExtensionInfo>(details)->extension;
-      break;
-    case chrome::NOTIFICATION_EXTENSION_UNINSTALLED_DEPRECATED:
-      event_name = management::OnUninstalled::kEventName;
-      extension = content::Details<const Extension>(details).ptr();
-      break;
-    case chrome::NOTIFICATION_EXTENSION_LOADED_DEPRECATED:
-      event_name = management::OnEnabled::kEventName;
-      extension = content::Details<const Extension>(details).ptr();
-      break;
-    case chrome::NOTIFICATION_EXTENSION_UNLOADED_DEPRECATED:
-      event_name = management::OnDisabled::kEventName;
-      extension =
-          content::Details<const UnloadedExtensionInfo>(details)->extension;
-      break;
-    default:
-      NOTREACHED();
-      return;
-  }
-  DCHECK(event_name);
-  DCHECK(extension);
+void ManagementEventRouter::OnExtensionLoaded(
+    content::BrowserContext* browser_context,
+    const Extension* extension) {
+  BroadcastEvent(extension, management::OnEnabled::kEventName);
+}
+
+void ManagementEventRouter::OnExtensionUnloaded(
+    content::BrowserContext* browser_context,
+    const Extension* extension,
+    UnloadedExtensionInfo::Reason reason) {
+  BroadcastEvent(extension, management::OnDisabled::kEventName);
+}
 
-  if (ui_util::ShouldNotBeVisible(extension, profile_))
-    return; // Don't dispatch events for built-in extensions.
+void ManagementEventRouter::OnExtensionInstalled(
+    content::BrowserContext* browser_context,
+    const Extension* extension) {
+  BroadcastEvent(extension, management::OnInstalled::kEventName);
+}
 
+void ManagementEventRouter::OnExtensionUninstalled(
+    content::BrowserContext* browser_context,
+    const Extension* extension) {
+  BroadcastEvent(extension, management::OnUninstalled::kEventName);
+}
+
+void ManagementEventRouter::BroadcastEvent(const Extension* extension,
+                                           const char* event_name) {
+  if (ui_util::ShouldNotBeVisible(extension, browser_context_))
+    return;  // Don't dispatch events for built-in extenions.
   scoped_ptr<base::ListValue> args(new base::ListValue());
   if (event_name == management::OnUninstalled::kEventName) {
     args->Append(new base::StringValue(extension->id()));
   } else {
-    scoped_ptr<management::ExtensionInfo> info = CreateExtensionInfo(
-        *extension, ExtensionSystem::Get(profile));
+    scoped_ptr<management::ExtensionInfo> info =
+        CreateExtensionInfo(*extension, ExtensionSystem::Get(browser_context_));
     args->Append(info->ToValue().release());
   }
 
-  scoped_ptr<Event> event(new Event(event_name, args.Pass()));
-  EventRouter::Get(profile)->BroadcastEvent(event.Pass());
+  EventRouter::Get(browser_context_)
+      ->BroadcastEvent(scoped_ptr<Event>(new Event(event_name, args.Pass())));
 }
 
 ManagementAPI::ManagementAPI(content::BrowserContext* context)
@@ -1032,8 +1008,7 @@ ManagementAPI::GetFactoryInstance() {
 }
 
 void ManagementAPI::OnListenerAdded(const EventListenerInfo& details) {
-  management_event_router_.reset(
-      new ManagementEventRouter(Profile::FromBrowserContext(browser_context_)));
+  management_event_router_.reset(new ManagementEventRouter(browser_context_));
   EventRouter::Get(browser_context_)->UnregisterObserver(this);
 }
 

chrome/browser/extensions/api/management/management_api.h

@@ -6,6 +6,7 @@
 #define CHROME_BROWSER_EXTENSIONS_API_MANAGEMENT_MANAGEMENT_API_H_
 
 #include "base/compiler_specific.h"
+#include "base/scoped_observer.h"
 #include "base/task/cancelable_task_tracker.h"
 #include "chrome/browser/extensions/bookmark_app_helper.h"
 #include "chrome/browser/extensions/chrome_extension_function.h"
@@ -14,15 +15,15 @@
 #include "chrome/common/web_application_info.h"
 #include "components/favicon_base/favicon_types.h"
 #include "components/keyed_service/core/keyed_service.h"
-#include "content/public/browser/notification_observer.h"
-#include "content/public/browser/notification_registrar.h"
 #include "extensions/browser/browser_context_keyed_api_factory.h"
 #include "extensions/browser/event_router.h"
+#include "extensions/browser/extension_registry_observer.h"
 
 class ExtensionService;
 class ExtensionUninstallDialog;
 
 namespace extensions {
+class ExtensionRegistry;
 
 class ManagementFunction : public ChromeSyncExtensionFunction {
  protected:
@@ -218,7 +219,7 @@ class ManagementGenerateAppForLinkFunction : public AsyncManagementFunction {
 
  private:
   void OnFaviconForApp(const favicon_base::FaviconImageResult& image_result);
-  void FinishCreateBookmarkApp(const extensions::Extension* extension,
+  void FinishCreateBookmarkApp(const Extension* extension,
                                const WebApplicationInfo& web_app_info);
 
   std::string title_;
@@ -230,26 +231,37 @@ class ManagementGenerateAppForLinkFunction : public AsyncManagementFunction {
   base::CancelableTaskTracker cancelable_task_tracker_;
 };
 
-class ManagementEventRouter : public content::NotificationObserver {
+class ManagementEventRouter : public ExtensionRegistryObserver {
  public:
-  explicit ManagementEventRouter(Profile* profile);
+  explicit ManagementEventRouter(content::BrowserContext* context);
   virtual ~ManagementEventRouter();
 
  private:
-  // content::NotificationObserver implementation.
-  virtual void Observe(int type,
-                       const content::NotificationSource& source,
-                       const content::NotificationDetails& details) OVERRIDE;
+  // ExtensionRegistryObserver implementation.
+  virtual void OnExtensionLoaded(content::BrowserContext* browser_context,
+                                 const Extension* extension) OVERRIDE;
+  virtual void OnExtensionUnloaded(
+      content::BrowserContext* browser_context,
+      const Extension* extension,
+      UnloadedExtensionInfo::Reason reason) OVERRIDE;
+  virtual void OnExtensionInstalled(content::BrowserContext* browser_context,
+                                    const Extension* extension) OVERRIDE;
+  virtual void OnExtensionUninstalled(content::BrowserContext* browser_context,
+                                      const Extension* extension) OVERRIDE;
+
+  // Dispatches management api events to listening extensions.
+  void BroadcastEvent(const Extension* extension, const char* event_name);
 
-  content::NotificationRegistrar registrar_;
+  content::BrowserContext* browser_context_;
 
-  Profile* profile_;
+  ScopedObserver<ExtensionRegistry, ExtensionRegistryObserver>
+      extension_registry_observer_;
 
   DISALLOW_COPY_AND_ASSIGN(ManagementEventRouter);
 };
 
 class ManagementAPI : public BrowserContextKeyedAPI,
-                      public extensions::EventRouter::Observer {
+                      public EventRouter::Observer {
  public:
   explicit ManagementAPI(content::BrowserContext* context);
   virtual ~ManagementAPI();
@@ -261,8 +273,7 @@ class ManagementAPI : public BrowserContextKeyedAPI,
   static BrowserContextKeyedAPIFactory<ManagementAPI>* GetFactoryInstance();
 
   // EventRouter::Observer implementation.
-  virtual void OnListenerAdded(const extensions::EventListenerInfo& details)
-      OVERRIDE;
+  virtual void OnListenerAdded(const EventListenerInfo& details) OVERRIDE;
 
  private:
   friend class BrowserContextKeyedAPIFactory<ManagementAPI>;