Use ExtensionRegistryObserver instead of deprecated extension notification from c/b/e/api.

chrome/browser/extensions/api/idle/idle_api_unittest.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/idle/idle_api.h"
 
 #include <limits.h>
 #include <string>
 
 #include "base/strings/string_number_conversions.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/extensions/api/idle/idle_api_constants.h"
 #include "chrome/browser/extensions/api/idle/idle_manager.h"
 #include "chrome/browser/extensions/api/idle/idle_manager_factory.h"
 #include "chrome/browser/extensions/extension_api_unittest.h"
 #include "chrome/common/extensions/api/idle.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_registry.h"
 #include "extensions/common/extension.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using ::testing::_;
 
 namespace idle = extensions::api::idle;
 
 namespace extensions {
 
@@ skipping 472 matching lines @@
   {
     ScopedListen listen(idle_manager_, extension()->id());
     idle_provider_->set_idle_time(16);
     EXPECT_CALL(*event_delegate_,
                 OnStateChanged(extension()->id(), IDLE_STATE_IDLE));
     idle_manager_->UpdateIdleState();
     testing::Mock::VerifyAndClearExpectations(event_delegate_);
   }
 
   // Threshold will reset after unload (and listen count == 0)
-  UnloadedExtensionInfo details(extension(),
-                                UnloadedExtensionInfo::REASON_UNINSTALL);
-  idle_manager_->Observe(
-      chrome::NOTIFICATION_EXTENSION_UNLOADED_DEPRECATED,
-      content::Source<Profile>(browser()->profile()),
-      content::Details<UnloadedExtensionInfo>(&details));
+  ExtensionRegistry* registry = ExtensionRegistry::Get(browser()->profile());
+  registry->TriggerOnUnloaded(extension(),
+                              UnloadedExtensionInfo::REASON_UNINSTALL);
 
   {
     ScopedListen listen(idle_manager_, extension()->id());
     idle_manager_->UpdateIdleState();
     testing::Mock::VerifyAndClearExpectations(event_delegate_);
 
     idle_provider_->set_idle_time(61);
     EXPECT_CALL(*event_delegate_,
                 OnStateChanged(extension()->id(), IDLE_STATE_IDLE));
     idle_manager_->UpdateIdleState();
   }
 }
 
 // Verifies that unloading an extension with no listeners or threshold works.
 TEST_F(IdleTest, UnloadOnly) {
-  UnloadedExtensionInfo details(extension(),
-                                UnloadedExtensionInfo::REASON_UNINSTALL);
-  idle_manager_->Observe(
-      chrome::NOTIFICATION_EXTENSION_UNLOADED_DEPRECATED,
-      content::Source<Profile>(browser()->profile()),
-      content::Details<UnloadedExtensionInfo>(&details));
+  ExtensionRegistry* registry = ExtensionRegistry::Get(browser()->profile());
+  registry->TriggerOnUnloaded(extension(),
+                              UnloadedExtensionInfo::REASON_UNINSTALL);
 }
 
 // Verifies that its ok for the unload notification to happen before all the
 // listener removals.
 TEST_F(IdleTest, UnloadWhileListening) {
   ScopedListen listen(idle_manager_, extension()->id());
-  UnloadedExtensionInfo details(extension(),
-                                UnloadedExtensionInfo::REASON_UNINSTALL);
-  idle_manager_->Observe(
-      chrome::NOTIFICATION_EXTENSION_UNLOADED_DEPRECATED,
-      content::Source<Profile>(browser()->profile()),
-      content::Details<UnloadedExtensionInfo>(&details));
+  ExtensionRegistry* registry = ExtensionRegistry::Get(browser()->profile());
+  registry->TriggerOnUnloaded(extension(),
+                              UnloadedExtensionInfo::REASON_UNINSTALL);
 }
 
 // Verifies that re-adding a listener after a state change doesn't immediately
 // fire a change event. Regression test for http://crbug.com/366580.
 TEST_F(IdleTest, ReAddListener) {
   idle_provider_->set_locked(false);
 
   {
     // Fire idle event.
     ScopedListen listen(idle_manager_, "test");
     idle_provider_->set_idle_time(60);
     EXPECT_CALL(*event_delegate_, OnStateChanged("test", IDLE_STATE_IDLE));
     idle_manager_->UpdateIdleState();
     testing::Mock::VerifyAndClearExpectations(event_delegate_);
   }
 
   // Trigger active.
   idle_provider_->set_idle_time(0);
   idle_manager_->UpdateIdleState();
 
   {
     // Nothing should have fired, the listener wasn't added until afterward.
     ScopedListen listen(idle_manager_, "test");
     idle_manager_->UpdateIdleState();
     testing::Mock::VerifyAndClearExpectations(event_delegate_);
   }
 }
 
 }  // namespace extensions