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

chrome/browser/apps/ephemeral_app_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 "chrome/browser/apps/ephemeral_app_browsertest.h"
 
 #include <vector>
 
 #include "apps/app_restore_service.h"
 #include "apps/saved_files_service.h"
@@ skipping 13 matching lines @@
 #include "content/public/test/browser_test.h"
 #include "content/public/test/test_utils.h"
 #include "extensions/browser/api/power/power_api.h"
 #include "extensions/browser/app_sorting.h"
 #include "extensions/browser/event_router.h"
 #include "extensions/browser/extension_prefs.h"
 #include "extensions/browser/extension_registry.h"
 #include "extensions/browser/extension_registry_observer.h"
 #include "extensions/browser/extension_system.h"
 #include "extensions/browser/extension_util.h"
-#include "extensions/browser/notification_types.h"
 #include "extensions/browser/process_manager.h"
+#include "extensions/browser/test_extension_registry_observer.h"
 #include "extensions/browser/uninstall_reason.h"
 #include "extensions/common/api/alarms.h"
 #include "extensions/common/extension.h"
 #include "extensions/test/extension_test_message_listener.h"
 #include "extensions/test/result_catcher.h"
 #include "sync/api/fake_sync_change_processor.h"
 #include "sync/api/sync_change_processor_wrapper_for_test.h"
 #include "sync/api/sync_error_factory_mock.h"
 #include "ui/app_list/app_list_switches.h"
 #include "ui/message_center/message_center.h"
@@ skipping 263 matching lines @@
 
 void EphemeralAppTestBase::CloseApp(const std::string& app_id) {
   EXPECT_EQ(1U, GetAppWindowCountForApp(app_id));
   extensions::AppWindow* app_window = GetFirstAppWindowForApp(app_id);
   ASSERT_TRUE(app_window);
   CloseAppWindow(app_window);
 }
 
 void EphemeralAppTestBase::CloseAppWaitForUnload(const std::string& app_id) {
   // Ephemeral apps are unloaded from extension system after they stop running.
-  content::WindowedNotificationObserver unloaded_signal(
-      extensions::NOTIFICATION_EXTENSION_UNLOADED_DEPRECATED,
-      content::Source<Profile>(profile()));
+  extensions::TestExtensionRegistryObserver observer(
+      ExtensionRegistry::Get(profile()), app_id);
   CloseApp(app_id);
-  unloaded_signal.Wait();
+  observer.WaitForExtensionUnloaded();
 }
 
 void EphemeralAppTestBase::EvictApp(const std::string& app_id) {
   // Uninstall the app, which is what happens when ephemeral apps get evicted
   // from the cache.
-  content::WindowedNotificationObserver uninstalled_signal(
-      extensions::NOTIFICATION_EXTENSION_UNINSTALLED_DEPRECATED,
-      content::Source<Profile>(profile()));
+  extensions::TestExtensionRegistryObserver observer(
+      ExtensionRegistry::Get(profile()), app_id);
 
   ExtensionService* service =
       ExtensionSystem::Get(profile())->extension_service();
   ASSERT_TRUE(service);
   service->UninstallExtension(
       app_id,
       extensions::UNINSTALL_REASON_ORPHANED_EPHEMERAL_EXTENSION,
       base::Bind(&base::DoNothing),
       NULL);
 
-  uninstalled_signal.Wait();
+  observer.WaitForExtensionUninstalled();
 }
 
 // EphemeralAppBrowserTest:
 
 class EphemeralAppBrowserTest : public EphemeralAppTestBase {
  protected:
   bool LaunchAppAndRunTest(const Extension* app, const char* test_name) {
     // Ephemeral apps are unloaded after they are closed. Ensure they are
     // enabled before launch.
     ExtensionService* service =
@@ skipping 605 matching lines @@
   InitSyncService();
   const Extension* app = InstallAndLaunchEphemeralApp(kNotificationsTestApp);
   ASSERT_TRUE(app);
   std::string app_id = app->id();
   app = NULL;
 
   // Initiate install.
   ReplaceEphemeralApp(app_id, kNotificationsTestApp, 0);
 
   // The delayed installation will occur when the ephemeral app is closed.
-  content::WindowedNotificationObserver installed_signal(
-      extensions::NOTIFICATION_EXTENSION_WILL_BE_INSTALLED_DEPRECATED,
-      content::Source<Profile>(profile()));
+  extensions::TestExtensionRegistryObserver observer(
+      ExtensionRegistry::Get(profile()), app_id);
   InstallObserver installed_observer(profile());
   CloseAppWaitForUnload(app_id);
-  installed_signal.Wait();
+  observer.WaitForExtensionWillBeInstalled();
   VerifyPromotedApp(app_id, ExtensionRegistry::ENABLED);
 
   // Check the notification parameters.
   const InstallObserver::InstallParameters& params = installed_observer.Last();
   EXPECT_EQ(app_id, params.id);
   EXPECT_TRUE(params.is_update);
   EXPECT_TRUE(params.from_ephemeral);
 }
 
 // Verifies that an installed app cannot turn into an ephemeral app as result of
@@ skipping 48 matching lines @@
       base::Bind(&PowerSaveBlockerStub::Create, &power_settings));
 
   const Extension* app = InstallAndLaunchEphemeralApp(kPowerTestApp);
   ASSERT_TRUE(app);
   EXPECT_EQ(1, power_settings.keep_awake_count());
 
   CloseAppWaitForUnload(app->id());
 
   EXPECT_EQ(0, power_settings.keep_awake_count());
 }