Remove some NOTIFICATION_EXTENSION_UNLOADED_DEPRECATED from c/b/extensions Part2

chrome/browser/extensions/api/log_private/log_private_api_chromeos.cc

 // Copyright 2013 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/log_private/log_private_api.h"
 
 #include <string>
 #include <vector>
 
 #include "base/json/json_writer.h"
 #include "base/lazy_instance.h"
 #include "base/logging.h"
 #include "base/memory/linked_ptr.h"
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/browser_process.h"
-#include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/extensions/api/log_private/filter_handler.h"
 #include "chrome/browser/extensions/api/log_private/log_parser.h"
 #include "chrome/browser/extensions/api/log_private/syslog_parser.h"
 #include "chrome/browser/feedback/system_logs/scrubbed_system_logs_fetcher.h"
 #include "chrome/browser/io_thread.h"
 #include "chrome/browser/net/chrome_net_log.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/extensions/api/log_private.h"
-#include "content/public/browser/notification_details.h"
-#include "content/public/browser/notification_source.h"
 #include "extensions/browser/event_router.h"
 #include "extensions/browser/extension_function.h"
+#include "extensions/browser/extension_registry.h"
 
 using content::BrowserThread;
 
 namespace events {
 const char kOnAddNetInternalsEntries[] = "logPrivate.onAddNetInternalsEntries";
 }  // namespace events
 
 namespace extensions {
 namespace {
 
@@ skipping 25 matching lines @@
 }
 
 }  // namespace
 
 // static
 LogPrivateAPI* LogPrivateAPI::Get(content::BrowserContext* context) {
   return GetFactoryInstance()->Get(context);
 }
 
 LogPrivateAPI::LogPrivateAPI(content::BrowserContext* context)
-    : profile_(Profile::FromBrowserContext(context)),
-      logging_net_internals_(false) {
-  registrar_.Add(this,
-                 chrome::NOTIFICATION_EXTENSION_UNLOADED_DEPRECATED,
-                 content::Source<Profile>(profile_));
+    : browser_context_(context),
+      logging_net_internals_(false),
+      extension_registry_observer_(this) {
+  extension_registry_observer_.Add(ExtensionRegistry::Get(browser_context_));
 }
 
 LogPrivateAPI::~LogPrivateAPI() {
 }
 
 void LogPrivateAPI::StartNetInternalsWatch(const std::string& extension_id) {
   net_internal_watches_.insert(extension_id);
   BrowserThread::PostTask(
       BrowserThread::IO, FROM_HERE,
       base::Bind(&LogPrivateAPI::MaybeStartNetInternalLogging,
                  base::Unretained(this)));
 }
 
 void LogPrivateAPI::StopNetInternalsWatch(const std::string& extension_id) {
   net_internal_watches_.erase(extension_id);
   MaybeStopNetInternalLogging();
 }
 
 static base::LazyInstance<BrowserContextKeyedAPIFactory<LogPrivateAPI> >
     g_factory = LAZY_INSTANCE_INITIALIZER;
 
 // static
 BrowserContextKeyedAPIFactory<LogPrivateAPI>*
 LogPrivateAPI::GetFactoryInstance() {
-  return &g_factory.Get();
+  return g_factory.Pointer();
 }
 
 void LogPrivateAPI::OnAddEntry(const net::NetLog::Entry& entry) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
   if (!pending_entries_.get()) {
     pending_entries_.reset(new base::ListValue());
     BrowserThread::PostDelayedTask(
         BrowserThread::IO, FROM_HERE,
         base::Bind(&LogPrivateAPI::PostPendingEntries, base::Unretained(this)),
         base::TimeDelta::FromMilliseconds(kNetLogEventDelayMilliseconds));
@@ skipping 12 matching lines @@
 void LogPrivateAPI::AddEntriesOnUI(scoped_ptr<base::ListValue> value) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
   for (std::set<std::string>::iterator ix = net_internal_watches_.begin();
        ix != net_internal_watches_.end(); ++ix) {
     // Create the event's arguments value.
     scoped_ptr<base::ListValue> event_args(new base::ListValue());
     event_args->Append(value->DeepCopy());
     scoped_ptr<Event> event(new Event(events::kOnAddNetInternalsEntries,
                                       event_args.Pass()));
-    EventRouter::Get(profile_)->DispatchEventToExtension(*ix, event.Pass());
+    EventRouter::Get(browser_context_)
+        ->DispatchEventToExtension(*ix, event.Pass());
   }
 }
 
 void LogPrivateAPI::MaybeStartNetInternalLogging() {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
   if (!logging_net_internals_) {
     g_browser_process->io_thread()->net_log()->AddThreadSafeObserver(
         this, net::NetLog::LOG_ALL_BUT_BYTES);
     logging_net_internals_ = true;
   }
 }
 
 void LogPrivateAPI::MaybeStopNetInternalLogging() {
   if (net_internal_watches_.empty()) {
     BrowserThread::PostTask(
         BrowserThread::IO, FROM_HERE,
         base::Bind(&LogPrivateAPI:: StopNetInternalLogging,
                    base::Unretained(this)));
   }
 }
 
 void LogPrivateAPI::StopNetInternalLogging() {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
   if (net_log() && logging_net_internals_) {
     net_log()->RemoveThreadSafeObserver(this);
     logging_net_internals_ = false;
   }
 }
 
-void LogPrivateAPI::Observe(int type,
-                            const content::NotificationSource& source,
-                            const content::NotificationDetails& details) {
-  if (type == chrome::NOTIFICATION_EXTENSION_UNLOADED_DEPRECATED) {
-    const Extension* extension =
-        content::Details<const UnloadedExtensionInfo>(details)->extension;
-    StopNetInternalsWatch(extension->id());
-  }
+void LogPrivateAPI::OnExtensionUnloaded(
+    content::BrowserContext* browser_context,
+    const Extension* extension,
+    UnloadedExtensionInfo::Reason reason) {
+  StopNetInternalsWatch(extension->id());
 }
 
 LogPrivateGetHistoricalFunction::LogPrivateGetHistoricalFunction() {
 }
 
 LogPrivateGetHistoricalFunction::~LogPrivateGetHistoricalFunction() {
 }
 
 bool LogPrivateGetHistoricalFunction::RunImpl() {
   // Get parameters
@@ skipping 49 matching lines @@
 LogPrivateStopNetInternalsWatchFunction::
 ~LogPrivateStopNetInternalsWatchFunction() {
 }
 
 bool LogPrivateStopNetInternalsWatchFunction::RunImpl() {
   LogPrivateAPI::Get(GetProfile())->StopNetInternalsWatch(extension_id());
   return true;
 }
 
 }  // namespace extensions