| Index: chrome/browser/extensions/extension_functional_browsertest.cc
|
| diff --git a/chrome/browser/extensions/extension_functional_browsertest.cc b/chrome/browser/extensions/extension_functional_browsertest.cc
|
| index 6221e34f429aa9e3093fbfaf0be79eb1c30f506d..72e75a8bd3b372cf538a81c1cb4e21ac6cb20bc8 100644
|
| --- a/chrome/browser/extensions/extension_functional_browsertest.cc
|
| +++ b/chrome/browser/extensions/extension_functional_browsertest.cc
|
| @@ -13,6 +13,7 @@
|
| #include "extensions/browser/extension_registry.h"
|
| #include "extensions/browser/extension_system.h"
|
| #include "extensions/browser/notification_types.h"
|
| +#include "extensions/browser/test_extension_registry_observer.h"
|
|
|
| namespace extensions {
|
|
|
| @@ -26,9 +27,7 @@ class ExtensionFunctionalTest : public ExtensionBrowserTest {
|
|
|
| base::FilePath path = test_data_dir_.AppendASCII(filename);
|
|
|
| - content::WindowedNotificationObserver extension_loaded_observer(
|
| - extensions::NOTIFICATION_EXTENSION_LOADED_DEPRECATED,
|
| - content::NotificationService::AllSources());
|
| + extensions::TestExtensionRegistryObserver extension_observer(registry);
|
|
|
| scoped_refptr<extensions::CrxInstaller> installer(
|
| extensions::CrxInstaller::CreateSilent(service));
|
| @@ -48,7 +47,7 @@ class ExtensionFunctionalTest : public ExtensionBrowserTest {
|
| size_t num_after = registry->enabled_extensions().size();
|
| EXPECT_EQ(num_before + 1, num_after);
|
|
|
| - extension_loaded_observer.Wait();
|
| + extension_observer.WaitForExtensionLoaded();
|
| const Extension* extension =
|
| registry->enabled_extensions().GetByID(last_loaded_extension_id());
|
| EXPECT_TRUE(extension);
|
|
|