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

chrome/browser/apps/ephemeral_app_service_browsertest.cc

 // Copyright 2013 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 <vector>
 
 #include "chrome/browser/apps/ephemeral_app_browsertest.h"
 #include "chrome/browser/apps/ephemeral_app_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "content/public/test/test_utils.h"
 #include "extensions/browser/extension_prefs.h"
 #include "extensions/browser/extension_registry.h"
-#include "extensions/browser/notification_types.h"
-#include "extensions/common/manifest.h"
+#include "extensions/browser/test_extension_registry_observer.h"
 
 using extensions::Extension;
 using extensions::ExtensionPrefs;
 using extensions::ExtensionRegistry;
 
 namespace {
 
 const int kNumTestApps = 2;
 const char* kTestApps[] = {
   "app_window/generic",
@@ skipping 58 matching lines @@
       base::TimeDelta::FromDays(EphemeralAppService::kAppInactiveThreshold + 1);
   prefs->SetLastLaunchTime(inactive_app_id, inactive_launch);
 
   // Set launch time for an active app.
   std::string active_app_id = app_ids_[1];
   base::Time active_launch = time_now -
       base::TimeDelta::FromDays(EphemeralAppService::kAppKeepThreshold);
   prefs->SetLastLaunchTime(active_app_id, active_launch);
 
   // Perform garbage collection.
-  content::WindowedNotificationObserver uninstall_signal(
-      extensions::NOTIFICATION_EXTENSION_UNINSTALLED_DEPRECATED,
-      content::Source<Profile>(browser()->profile()));
+  extensions::TestExtensionRegistryObserver observer(
+      ExtensionRegistry::Get(browser()->profile()));
   GarbageCollectEphemeralApps();
-  uninstall_signal.Wait();
+  observer.WaitForExtensionUninstalled();
 
   ExtensionRegistry* registry = ExtensionRegistry::Get(profile());
   ASSERT_TRUE(registry);
   EXPECT_FALSE(registry->GetExtensionById(inactive_app_id,
                                           ExtensionRegistry::EVERYTHING));
   EXPECT_TRUE(
       registry->GetExtensionById(active_app_id, ExtensionRegistry::EVERYTHING));
 
   EXPECT_EQ(1, ephemeral_service->ephemeral_app_count());
 }
@@ skipping 92 matching lines @@
       installed_app->id(), Extension::DISABLE_INACTIVE_EPHEMERAL_APP));
   EXPECT_FALSE(prefs->HasDisableReason(
       running_app->id(), Extension::DISABLE_INACTIVE_EPHEMERAL_APP));
   EXPECT_TRUE(prefs->HasDisableReason(
       inactive_app->id(), Extension::DISABLE_INACTIVE_EPHEMERAL_APP));
   EXPECT_TRUE(prefs->HasDisableReason(
       disabled_app->id(), Extension::DISABLE_INACTIVE_EPHEMERAL_APP));
   EXPECT_TRUE(prefs->HasDisableReason(
       disabled_app->id(), Extension::DISABLE_PERMISSIONS_INCREASE));
 }