Add a test helper class for ExtensionRegistry.

chrome/browser/extensions/api/content_settings/content_settings_apitest.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 "base/prefs/pref_service.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/content_settings/cookie_settings.h"
 #include "chrome/browser/content_settings/host_content_settings_map.h"
 #include "chrome/browser/extensions/api/content_settings/content_settings_api.h"
 #include "chrome/browser/extensions/extension_apitest.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/plugin_service.h"
 #include "content/public/common/webplugininfo.h"
 #include "content/public/test/test_utils.h"
+#include "extensions/browser/extension_registry.h"
+#include "extensions/browser/test_extension_registry_observer.h"
 
 namespace {
 
 void ReleaseBrowserProcessModule() {
   g_browser_process->ReleaseModule();
 }
 
 }  // namespace
 
 namespace extensions {
@@ skipping 158 matching lines @@
 
   EXPECT_TRUE(RunExtensionSubtest(kExtensionPath, "test.html")) << message_;
   CheckContentSettingsSet();
 
   // The settings should not be reset when the extension is reloaded.
   ReloadExtension(last_loaded_extension_id());
   CheckContentSettingsSet();
 
   // Uninstalling and installing the extension (without running the test that
   // calls the extension API) should clear the settings.
-  content::WindowedNotificationObserver observer(
-      chrome::NOTIFICATION_EXTENSION_UNINSTALLED_DEPRECATED,
-      content::NotificationService::AllSources());
+  TestExtensionRegistryObserver observer(ExtensionRegistry::Get(profile()),
+                                         last_loaded_extension_id());
   UninstallExtension(last_loaded_extension_id());
-  observer.Wait();
+  observer.WaitForExtensionUninstalled();
   CheckContentSettingsDefault();
 
   LoadExtension(test_data_dir_.AppendASCII(kExtensionPath));
   CheckContentSettingsDefault();
 }
 
 // Flaky on the trybots. See http://crbug.com/96725.
 IN_PROC_BROWSER_TEST_F(ExtensionContentSettingsApiTest,
                        DISABLED_GetResourceIdentifiers) {
   base::FilePath::CharType kFooPath[] =
@@ skipping 14 matching lines @@
                            base::FilePath(kBarPath),
                            base::ASCIIToUTF16("2.3.4"),
                            base::ASCIIToUTF16("bar")),
       false);
 
   EXPECT_TRUE(RunExtensionTest("content_settings/getresourceidentifiers"))
       << message_;
 }
 
 }  // namespace extensions