Add a test helper class for ExtensionRegistry.

chrome/browser/extensions/api/preference/preference_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/extensions/extension_apitest.h"
 #include "chrome/browser/extensions/extension_test_message_listener.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 "chrome/test/base/ui_test_utils.h"
 #include "components/translate/core/common/translate_pref_names.h"
 #include "content/public/browser/notification_service.h"
+#include "extensions/browser/extension_registry.h"
+#include "extensions/browser/test_extension_registry_observer.h"
 
 namespace {
 
 void ReleaseBrowserProcessModule() {
   g_browser_process->ReleaseModule();
 }
 
 }  // namespace
 
 class ExtensionPreferenceApiTest : public ExtensionApiTest {
@@ skipping 82 matching lines @@
 
   EXPECT_TRUE(RunExtensionSubtest(kExtensionPath, "test.html")) << message_;
   CheckPreferencesSet();
 
   // The settings should not be reset when the extension is reloaded.
   ReloadExtension(last_loaded_extension_id());
   CheckPreferencesSet();
 
   // 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());
+  extensions::TestExtensionRegistryObserver observer(
+      extensions::ExtensionRegistry::Get(profile_), last_loaded_extension_id());
   UninstallExtension(last_loaded_extension_id());
-  observer.Wait();
+  observer.WaitForExtensionUninstalled();
   CheckPreferencesCleared();
 
   LoadExtension(test_data_dir_.AppendASCII(kExtensionPath));
   CheckPreferencesCleared();
 }
 
 IN_PROC_BROWSER_TEST_F(ExtensionPreferenceApiTest, PersistentIncognito) {
   PrefService* prefs = profile_->GetPrefs();
   prefs->SetBoolean(prefs::kBlockThirdPartyCookies, false);
 
@@ skipping 175 matching lines @@
 
   // Test 6 - clearDefault
   EXPECT_TRUE(listener10.WaitUntilSatisfied()); // Regular ready
   EXPECT_TRUE(listener_incognito10.WaitUntilSatisfied()); // Incognito ready
   listener10.Reply("ok");
   listener_incognito10.Reply("ok");
 
   EXPECT_TRUE(catcher.GetNextResult()) << catcher.message();
   EXPECT_TRUE(catcher_incognito.GetNextResult()) << catcher.message();
 }