| Index: extensions/browser/extension_registry_unittest.cc
|
| diff --git a/extensions/browser/extension_registry_unittest.cc b/extensions/browser/extension_registry_unittest.cc
|
| index 36fbfec3c1ada5895b390cb0ae719f606e2d4ffe..18362938da7b0a274e68088cf2bab5ae0f8d8ba2 100644
|
| --- a/extensions/browser/extension_registry_unittest.cc
|
| +++ b/extensions/browser/extension_registry_unittest.cc
|
| @@ -74,6 +74,10 @@ class TestObserver : public ExtensionRegistryObserver {
|
| uninstalled_.push_back(extension);
|
| }
|
|
|
| + virtual void OnShutdown(extensions::ExtensionRegistry* registry) OVERRIDE {
|
| + Reset();
|
| + }
|
| +
|
| ExtensionList loaded_;
|
| ExtensionList unloaded_;
|
| ExtensionList installed_;
|
| @@ -252,14 +256,14 @@ TEST_F(ExtensionRegistryTest, Observer) {
|
|
|
| EXPECT_TRUE(HasSingleExtension(observer.loaded(), extension.get()));
|
| EXPECT_TRUE(observer.unloaded().empty());
|
| - observer.Reset();
|
| + registry.Shutdown();
|
|
|
| registry.RemoveEnabled(extension->id());
|
| registry.TriggerOnUnloaded(extension, UnloadedExtensionInfo::REASON_DISABLE);
|
|
|
| EXPECT_TRUE(observer.loaded().empty());
|
| EXPECT_TRUE(HasSingleExtension(observer.unloaded(), extension.get()));
|
| - observer.Reset();
|
| + registry.Shutdown();
|
|
|
| registry.TriggerOnUninstalled(extension);
|
| EXPECT_TRUE(observer.installed().empty());
|
|
|