Use ExtensionRegistryObserver instead of DEPRECATED extension notify from app_window_geometry_cache

apps/app_window_geometry_cache.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 "apps/app_window_geometry_cache.h"
 
 #include "base/bind.h"
 #include "base/stl_util.h"
 #include "base/strings/string_number_conversions.h"
-#include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/profiles/incognito_helpers.h"
 #include "chrome/browser/profiles/profile.h"
 #include "components/keyed_service/content/browser_context_dependency_manager.h"
-#include "content/public/browser/notification_service.h"
-#include "content/public/browser/notification_types.h"
 #include "extensions/browser/extension_prefs.h"
 #include "extensions/browser/extension_prefs_factory.h"
+#include "extensions/browser/extension_registry.h"
 #include "extensions/browser/extensions_browser_client.h"
 #include "extensions/common/extension.h"
 
 namespace {
 
 // The timeout in milliseconds before we'll persist window geometry to the
 // StateStore.
 const int kSyncTimeoutMilliseconds = 1000;
 
 }  // namespace
 
 namespace apps {
 
 AppWindowGeometryCache::AppWindowGeometryCache(
     Profile* profile,
     extensions::ExtensionPrefs* prefs)
     : prefs_(prefs),
-      sync_delay_(base::TimeDelta::FromMilliseconds(kSyncTimeoutMilliseconds)) {
-  registrar_.Add(this,
-                 chrome::NOTIFICATION_EXTENSION_LOADED_DEPRECATED,
-                 content::Source<Profile>(profile));
-  registrar_.Add(this,
-                 chrome::NOTIFICATION_EXTENSION_UNLOADED_DEPRECATED,
-                 content::Source<Profile>(profile));
+      sync_delay_(base::TimeDelta::FromMilliseconds(kSyncTimeoutMilliseconds)),
+      extension_registry_observer_(this) {
+  extension_registry_observer_.Add(extensions::ExtensionRegistry::Get(profile));
 }
 
 AppWindowGeometryCache::~AppWindowGeometryCache() {}
 
 // static
 AppWindowGeometryCache* AppWindowGeometryCache::Get(
     content::BrowserContext* context) {
   return Factory::GetForContext(context, true /* create */);
 }
 
@@ skipping 133 matching lines @@
   return true;
 }
 
 void AppWindowGeometryCache::Shutdown() { SyncToStorage(); }
 
 AppWindowGeometryCache::WindowData::WindowData()
     : window_state(ui::SHOW_STATE_DEFAULT) {}
 
 AppWindowGeometryCache::WindowData::~WindowData() {}
 
-void AppWindowGeometryCache::Observe(
-    int type,
-    const content::NotificationSource& source,
-    const content::NotificationDetails& details) {
-  switch (type) {
-    case chrome::NOTIFICATION_EXTENSION_LOADED_DEPRECATED: {
-      std::string extension_id =
-          content::Details<const extensions::Extension>(details).ptr()->id();
-      LoadGeometryFromStorage(extension_id);
-      break;
-    }
-    case chrome::NOTIFICATION_EXTENSION_UNLOADED_DEPRECATED: {
-      std::string extension_id =
-          content::Details<const extensions::UnloadedExtensionInfo>(details)
-              .ptr()
-              ->extension->id();
-      OnExtensionUnloaded(extension_id);
-      break;
-    }
-    default:
-      NOTREACHED();
-      return;
-  }
+void AppWindowGeometryCache::OnExtensionLoaded(
+    content::BrowserContext* browser_context,
+    const extensions::Extension* extension) {
+  LoadGeometryFromStorage(extension->id());
+}
+
+void AppWindowGeometryCache::OnExtensionUnloaded(
+    content::BrowserContext* browser_context,
+    const extensions::Extension* extension,
+    extensions::UnloadedExtensionInfo::Reason reason) {
+  SyncToStorage();
+  cache_.erase(extension->id());
 }
 
 void AppWindowGeometryCache::SetSyncDelayForTests(int timeout_ms) {
   sync_delay_ = base::TimeDelta::FromMilliseconds(timeout_ms);
 }
 
 void AppWindowGeometryCache::LoadGeometryFromStorage(
     const std::string& extension_id) {
   ExtensionData& extension_data = cache_[extension_id];
 
@@ skipping 39 matching lines @@
           int64 ts;
           if (base::StringToInt64(ts_as_string, &ts)) {
             window_data.last_change = base::Time::FromInternalValue(ts);
           }
         }
       }
     }
   }
 }
 
-void AppWindowGeometryCache::OnExtensionUnloaded(
-    const std::string& extension_id) {
-  SyncToStorage();
-  cache_.erase(extension_id);
-}
-
 ///////////////////////////////////////////////////////////////////////////////
 // Factory boilerplate
 
 // static
 AppWindowGeometryCache* AppWindowGeometryCache::Factory::GetForContext(
     content::BrowserContext* context,
     bool create) {
   return static_cast<AppWindowGeometryCache*>(
       GetInstance()->GetServiceForBrowserContext(context, create));
 }
@@ skipping 32 matching lines @@
 
 void AppWindowGeometryCache::AddObserver(Observer* observer) {
   observers_.AddObserver(observer);
 }
 
 void AppWindowGeometryCache::RemoveObserver(Observer* observer) {
   observers_.RemoveObserver(observer);
 }
 
 }  // namespace apps