Cleanup/ Use ExtensionRegistry from app_sync_ui_state.*

chrome/browser/ui/ash/app_sync_ui_state.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/ui/ash/app_sync_ui_state.h"
 
 #include "base/prefs/pref_service.h"
-#include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/pending_extension_manager.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sync/profile_sync_service.h"
 #include "chrome/browser/sync/profile_sync_service_factory.h"
 #include "chrome/browser/ui/ash/app_sync_ui_state_factory.h"
 #include "chrome/browser/ui/ash/app_sync_ui_state_observer.h"
-#include "content/public/browser/notification_details.h"
-#include "content/public/browser/notification_service.h"
-#include "content/public/browser/notification_source.h"
+#include "extensions/browser/extension_registry.h"
 #include "extensions/browser/extension_system.h"
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/login/users/user_manager.h"
 #endif
 
 namespace {
 
 // Max loading animation time in milliseconds.
 const int kMaxSyncingTimeMs = 60 * 1000;
@@ skipping 19 matching lines @@
 
   return profile->IsNewProfile();
 #else
   return false;
 #endif
 }
 
 AppSyncUIState::AppSyncUIState(Profile* profile)
     : profile_(profile),
       sync_service_(NULL),
-      status_(STATUS_NORMAL) {
+      status_(STATUS_NORMAL),
+      extension_registry_(NULL) {
   StartObserving();
 }
 
 AppSyncUIState::~AppSyncUIState() {
   StopObserving();
 }
 
 void AppSyncUIState::AddObserver(AppSyncUIStateObserver* observer) {
   observers_.AddObserver(observer);
 }
 
 void AppSyncUIState::RemoveObserver(AppSyncUIStateObserver* observer) {
   observers_.RemoveObserver(observer);
 }
 
 void AppSyncUIState::StartObserving() {
   DCHECK(ShouldObserveAppSyncForProfile(profile_));
   DCHECK(!sync_service_);
+  DCHECK(!extension_registry_);
 
-  registrar_.Add(this,
-                 chrome::NOTIFICATION_EXTENSION_LOADED_DEPRECATED,
-                 content::Source<Profile>(profile_));
+  extension_registry_ = extensions::ExtensionRegistry::Get(profile_);
+  extension_registry_->AddObserver(this);
 
   sync_service_ = ProfileSyncServiceFactory::GetForProfile(profile_);
   CHECK(sync_service_);
   sync_service_->AddObserver(this);
 }
 
 void AppSyncUIState::StopObserving() {
   if (!sync_service_)
     return;
 
-  registrar_.RemoveAll();
   sync_service_->RemoveObserver(this);
   sync_service_ = NULL;
+
+  if (extension_registry_)
+    extension_registry_->RemoveObserver(this);
+  extension_registry_ = NULL;
+
   profile_ = NULL;
 }
 
 void AppSyncUIState::SetStatus(Status status) {
   if (status_ == status)
     return;
 
   status_ = status;
   switch (status_) {
     case STATUS_SYNCING:
@@ skipping 26 matching lines @@
   if (synced && !has_pending_extension)
     SetStatus(STATUS_NORMAL);
   else
     SetStatus(STATUS_SYNCING);
 }
 
 void AppSyncUIState::OnMaxSyncingTimer() {
   SetStatus(STATUS_TIMED_OUT);
 }
 
-void AppSyncUIState::Observe(int type,
-                             const content::NotificationSource& source,
-                             const content::NotificationDetails& details) {
-  DCHECK_EQ(chrome::NOTIFICATION_EXTENSION_LOADED_DEPRECATED, type);
+void AppSyncUIState::OnExtensionLoaded(content::BrowserContext* browser_context,

[James Cook, 2014/07/22 16:29:24]

and when you change the order in the header, change the order of the functions
here too

[limasdf, 2014/07/22 16:38:10]

Done.

+                                       const extensions::Extension* extension) {
   CheckAppSync();
 }
 
 void AppSyncUIState::OnStateChanged() {
   DCHECK(sync_service_);
   CheckAppSync();
 }