| Index: chrome/browser/extensions/api/content_settings/content_settings_apitest.cc
|
| diff --git a/chrome/browser/extensions/api/content_settings/content_settings_apitest.cc b/chrome/browser/extensions/api/content_settings/content_settings_apitest.cc
|
| index f50535ac9b6554482932da59f6513218ae774505..a7fae5e44773fcfbc6769ba49179c139c1569727 100644
|
| --- a/chrome/browser/extensions/api/content_settings/content_settings_apitest.cc
|
| +++ b/chrome/browser/extensions/api/content_settings/content_settings_apitest.cc
|
| @@ -18,6 +18,8 @@
|
| #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 {
|
|
|
| @@ -196,11 +198,10 @@ IN_PROC_BROWSER_TEST_F(ExtensionContentSettingsApiTest, MAYBE_Standard) {
|
|
|
| // 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));
|
|
|