Cleanup: Remove NOTIFICATION_EXTENSION_UNLOADED usage in MediaScanManager.

chrome/browser/media_galleries/media_scan_manager.cc

 // Copyright 2014 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/media_galleries/media_scan_manager.h"
 
 #include "base/file_util.h"
 #include "base/files/file_enumerator.h"
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
 #include "base/time/time.h"
-#include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/media_galleries/media_galleries_preferences.h"
 #include "chrome/browser/media_galleries/media_galleries_preferences_factory.h"
 #include "chrome/browser/media_galleries/media_scan_manager_observer.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/extensions/api/media_galleries.h"
 #include "content/public/browser/browser_thread.h"
-#include "content/public/browser/notification_details.h"
-#include "content/public/browser/notification_source.h"
+#include "extensions/browser/extension_registry.h"
 #include "extensions/browser/extension_system.h"
 #include "extensions/common/extension.h"
 
+using extensions::ExtensionRegistry;
+
 namespace media_galleries = extensions::api::media_galleries;
 
 namespace {
 
 typedef std::set<std::string /*extension id*/> ScanningExtensionIdSet;
 
 // When multiple scan results have the same parent, sometimes it makes sense
 // to combine them into a single scan result at the parent. This constant
 // governs when that happens; kContainerDirectoryMinimumPercent percent of the
 // directories in the parent directory must be scan results.
@@ skipping 262 matching lines @@
       file_counts->audio_count += it->second.audio_count;
       file_counts->image_count += it->second.image_count;
       file_counts->video_count += it->second.video_count;
     }
   }
   return gallery_count;
 }
 
 }  // namespace
 
-MediaScanManager::MediaScanManager() : weak_factory_(this) {
+MediaScanManager::MediaScanManager()
+    : scoped_extension_registry_observer_(this),
+      weak_factory_(this) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
 }
 
 MediaScanManager::~MediaScanManager() {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
 }
 
 void MediaScanManager::AddObserver(Profile* profile,
                                    MediaScanManagerObserver* observer) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
@@ skipping 44 matching lines @@
     int gallery_count =
         CountScanResultsForExtension(preferences, extension, &file_counts);
     scans_for_profile->second.observer->OnScanStarted(extension->id());
     scans_for_profile->second.observer->OnScanFinished(extension->id(),
                                                        gallery_count,
                                                        file_counts);
     return;
   }
 
   // On first scan for the |profile|, register to listen for extension unload.
-  if (scanning_extensions->empty()) {
-    registrar_.Add(
-        this,
-        chrome::NOTIFICATION_EXTENSION_UNLOADED_DEPRECATED,
-        content::Source<Profile>(profile));
-  }
+  if (scanning_extensions->empty())
+    scoped_extension_registry_observer_.Add(ExtensionRegistry::Get(profile));
 
   scanning_extensions->insert(extension->id());
   scans_for_profile->second.observer->OnScanStarted(extension->id());
 
   if (folder_finder_)
     return;
 
   MediaFolderFinder::MediaFolderFinderResultsCallback callback =
       base::Bind(&MediaScanManager::OnScanCompleted,
                  weak_factory_.GetWeakPtr());
@@ skipping 13 matching lines @@
   // Erases the logical scan if found, early exit otherwise.
   ScanObserverMap::iterator scans_for_profile = observers_.find(profile);
   if (scans_for_profile == observers_.end() ||
       !scans_for_profile->second.scanning_extensions.erase(extension->id())) {
     return;
   }
 
   scans_for_profile->second.observer->OnScanCancelled(extension->id());
 
   // No more scanning extensions for |profile|, so stop listening for unloads.
-  if (scans_for_profile->second.scanning_extensions.empty()) {
-    registrar_.Remove(
-        this,
-        chrome::NOTIFICATION_EXTENSION_UNLOADED_DEPRECATED,
-        content::Source<Profile>(profile));
-  }
+  if (scans_for_profile->second.scanning_extensions.empty())
+    scoped_extension_registry_observer_.Remove(ExtensionRegistry::Get(profile));
 
   if (!ScanInProgress()) {
     folder_finder_.reset();
     DCHECK(!scan_start_time_.is_null());
     UMA_HISTOGRAM_LONG_TIMES("MediaGalleries.ScanCancelTime",
                              base::Time::Now() - scan_start_time_);
     scan_start_time_ = base::Time();
   }
 }
 
 void MediaScanManager::SetMediaFolderFinderFactory(
     const MediaFolderFinderFactory& factory) {
   testing_folder_finder_factory_ = factory;
 }
 
 MediaScanManager::ScanObservers::ScanObservers() : observer(NULL) {}
 MediaScanManager::ScanObservers::~ScanObservers() {}
 
-void MediaScanManager::Observe(
-    int type, const content::NotificationSource& source,
-    const content::NotificationDetails& details) {
+void MediaScanManager::OnExtensionUnloaded(
+    content::BrowserContext* browser_context,
+    const extensions::Extension* extension) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
-  switch (type) {
-    case chrome::NOTIFICATION_EXTENSION_UNLOADED_DEPRECATED: {
-      Profile* profile = content::Source<Profile>(source).ptr();
-      extensions::Extension* extension = const_cast<extensions::Extension*>(
-          content::Details<extensions::UnloadedExtensionInfo>(
-              details)->extension);
-      DCHECK(extension);
-      CancelScan(profile, extension);
-      break;
-    }
-    default:
-      NOTREACHED();
-  }
+  CancelScan(Profile::FromBrowserContext(browser_context), extension);
 }
 
 bool MediaScanManager::ScanInProgress() const {
   for (ScanObserverMap::const_iterator it = observers_.begin();
        it != observers_.end();
        ++it) {
     if (!it->second.scanning_extensions.empty())
       return true;
   }
   return false;
@@ skipping 60 matching lines @@
         int gallery_count = CountScanResultsForExtension(preferences, extension,
                                                          &file_counts);
         scans_for_profile->second.observer->OnScanFinished(*extension_id_it,
                                                            gallery_count,
                                                            file_counts);
       }
     }
     scanning_extensions->clear();
     preferences->SetLastScanCompletionTime(base::Time::Now());
   }
-  registrar_.RemoveAll();
+  scoped_extension_registry_observer_.RemoveAll();
   folder_finder_.reset();
 }