Remove NOTIFICATION_EXTENSION_UNLOADED_DEPRECATED from c/b/e/api

chrome/browser/extensions/api/downloads/downloads_api.cc

 // 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.
 
 #include "chrome/browser/extensions/api/downloads/downloads_api.h"
 
 #include <algorithm>
 #include <cctype>
 #include <iterator>
 #include <set>
@@ skipping 51 matching lines @@
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/render_widget_host_view.h"
 #include "content/public/browser/resource_context.h"
 #include "content/public/browser/resource_dispatcher_host.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_view.h"
 #include "extensions/browser/event_router.h"
 #include "extensions/browser/extension_function_dispatcher.h"
 #include "extensions/browser/extension_prefs.h"
+#include "extensions/browser/extension_registry.h"
 #include "extensions/browser/extension_system.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/permissions/permissions_data.h"
 #include "net/base/filename_util.h"
 #include "net/base/load_flags.h"
 #include "net/http/http_util.h"
 #include "net/url_request/url_request.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/base/webui/web_ui_util.h"
 #include "ui/gfx/image/image_skia.h"
@@ skipping 419 matching lines @@
     if (*query_in.limit.get() < 0) {
       *error = errors::kInvalidQueryLimit;
       return;
     }
     limit = *query_in.limit.get();
   }
   if (limit > 0) {
     query_out.Limit(limit);
   }
 
-  std::string state_string =
-      downloads::ToString(query_in.state);
+  std::string state_string = downloads::ToString(query_in.state);
   if (!state_string.empty()) {
     DownloadItem::DownloadState state = StateEnumFromString(state_string);
     if (state == DownloadItem::MAX_DOWNLOAD_STATE) {
       *error = errors::kInvalidState;
       return;
     }
     query_out.AddFilter(state);
   }
   std::string danger_string =
       downloads::ToString(query_in.danger);
@@ skipping 992 matching lines @@
   }
   RecordApiFunctions(DOWNLOADS_FUNCTION_GET_FILE_ICON);
   SetResult(new base::StringValue(url));
   SendResponse(true);
 }
 
 ExtensionDownloadsEventRouter::ExtensionDownloadsEventRouter(
     Profile* profile,
     DownloadManager* manager)
     : profile_(profile),
-      notifier_(manager, this) {
+      notifier_(manager, this),
+      scoped_extension_registry_observer_(this) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   DCHECK(profile_);
-  registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_UNLOADED_DEPRECATED,
-                 content::Source<Profile>(profile_));
+  scoped_extension_registry_observer_.Add(
+      extensions::ExtensionRegistry::Get(profile_));
   extensions::EventRouter* router = extensions::EventRouter::Get(profile_);
   if (router)
     router->RegisterObserver(this,
                              downloads::OnDeterminingFilename::kEventName);
 }
 
 ExtensionDownloadsEventRouter::~ExtensionDownloadsEventRouter() {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   extensions::EventRouter* router = extensions::EventRouter::Get(profile_);
   if (router)
@@ skipping 350 matching lines @@
   notification_source.event_name = event_name;
   notification_source.profile = profile_;
   content::Source<DownloadsNotificationSource> content_source(
       &notification_source);
   content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_EXTENSION_DOWNLOADS_EVENT,
       content_source,
       content::Details<std::string>(&json_args));
 }
 
-void ExtensionDownloadsEventRouter::Observe(
-    int type,
-    const content::NotificationSource& source,
-    const content::NotificationDetails& details) {
+void ExtensionDownloadsEventRouter::OnExtensionUnloaded(
+    content::BrowserContext* browser_context,
+    const extensions::Extension* extension,
+    extensions::UnloadedExtensionInfo::Reason reason) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
-  switch (type) {
-    case chrome::NOTIFICATION_EXTENSION_UNLOADED_DEPRECATED: {
-      extensions::UnloadedExtensionInfo* unloaded =
-          content::Details<extensions::UnloadedExtensionInfo>(details).ptr();
-      std::set<const extensions::Extension*>::iterator iter =
-        shelf_disabling_extensions_.find(unloaded->extension);
+  std::set<const extensions::Extension*>::iterator iter =
+      shelf_disabling_extensions_.find(extension);
       if (iter != shelf_disabling_extensions_.end())

[benjhayden, 2014/04/24 17:38:48]

Is the indentation correct here? I can't tell.

[limasdf, 2014/04/24 18:27:47]

My bad. Done.

         shelf_disabling_extensions_.erase(iter);
-      break;
-    }
-  }
 }