Cleanup/ Remove deprecated extension notification from c/b/apps/

chrome/browser/apps/ephemeral_app_launcher_browsertest.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 "base/message_loop/message_loop_proxy.h"
 #include "chrome/browser/apps/ephemeral_app_launcher.h"
 #include "chrome/browser/apps/ephemeral_app_service.h"
 #include "chrome/browser/extensions/extension_install_checker.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/install_tracker.h"
 #include "chrome/browser/extensions/test_blacklist.h"
 #include "chrome/browser/extensions/webstore_installer_test.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/common/chrome_switches.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/test/test_utils.h"
 #include "extensions/browser/extension_prefs.h"
 #include "extensions/browser/extension_registry.h"
 #include "extensions/browser/extension_system.h"
 #include "extensions/browser/extension_util.h"
 #include "extensions/browser/management_policy.h"
 #include "extensions/browser/process_manager.h"
+#include "extensions/browser/test_extension_registry_observer.h"
 #include "extensions/test/extension_test_message_listener.h"
 
 using extensions::Extension;
 using extensions::ExtensionPrefs;
 using extensions::ExtensionRegistry;
 using extensions::ExtensionSystem;
 using extensions::InstallTracker;
 namespace webstore_install = extensions::webstore_install;
 
 namespace {
@@ skipping 280 matching lines @@
 IN_PROC_BROWSER_TEST_F(EphemeralAppLauncherTestDisabled, FeatureDisabled) {
   RunLaunchTest(
       kDefaultAppCrxFilename, webstore_install::LAUNCH_FEATURE_DISABLED, false);
   EXPECT_FALSE(GetInstalledExtension(kDefaultAppId));
 }
 
 // Verifies that an app with no permission warnings will be installed
 // ephemerally and launched without prompting the user.
 IN_PROC_BROWSER_TEST_F(EphemeralAppLauncherTest,
                        LaunchAppWithNoPermissionWarnings) {
-  content::WindowedNotificationObserver unloaded_signal(
-      extensions::NOTIFICATION_EXTENSION_UNLOADED_DEPRECATED,
-      content::Source<Profile>(profile()));
+  extensions::TestExtensionRegistryObserver observer(
+      ExtensionRegistry::Get(profile()));
 
   scoped_refptr<EphemeralAppLauncherForTest> launcher(
       new EphemeralAppLauncherForTest(kDefaultAppId, profile()));
   StartLauncherAndCheckResult(launcher.get(), webstore_install::SUCCESS, true);
   ValidateAppInstalledEphemerally(kDefaultAppId);
 
   // Apps with no permission warnings should not result in a prompt.
   EXPECT_FALSE(launcher->install_prompt_created());
 
   // Ephemeral apps are unloaded after they stop running.
-  unloaded_signal.Wait();
+  observer.WaitForExtensionUnloaded();
 
   // After an app has been installed ephemerally, it can be launched again
   // without installing from the web store.
   RunLaunchTest(kDefaultAppId, webstore_install::SUCCESS, false);
 }
 
 // Verifies that an app with permission warnings will be installed
 // ephemerally and launched if accepted by the user.
 IN_PROC_BROWSER_TEST_F(EphemeralAppLauncherTest,
                        LaunchAppWithPermissionsWarnings) {
@@ skipping 211 matching lines @@
 }
 
 // Verifies that a launch will fail if a duplicate launch is in progress.
 IN_PROC_BROWSER_TEST_F(EphemeralAppLauncherTest, DuplicateLaunchInProgress) {
   extensions::ActiveInstallData install_data(kDefaultAppId);
   install_data.is_ephemeral = true;
   InstallTracker::Get(profile())->AddActiveInstall(install_data);
 
   RunLaunchTest(kDefaultAppId, webstore_install::LAUNCH_IN_PROGRESS, false);
 }