| Index: extensions/browser/test_extension_registry_observer.h
|
| diff --git a/extensions/browser/test_extension_registry_observer.h b/extensions/browser/test_extension_registry_observer.h
|
| index 398b4dfe4a7ec7b86eb557d86b85bb42eadf7291..34e9a18fbf74e6da2e1596f1807136e25e35a5e7 100644
|
| --- a/extensions/browser/test_extension_registry_observer.h
|
| +++ b/extensions/browser/test_extension_registry_observer.h
|
| @@ -16,7 +16,7 @@ class TestExtensionRegistryObserver : public ExtensionRegistryObserver {
|
| public:
|
| explicit TestExtensionRegistryObserver(ExtensionRegistry* registry,
|
| const std::string& extension_id);
|
| - virtual ~TestExtensionRegistryObserver();
|
| + ~TestExtensionRegistryObserver() override;
|
|
|
| void WaitForExtensionWillBeInstalled();
|
| void WaitForExtensionUninstalled();
|
| @@ -27,22 +27,19 @@ class TestExtensionRegistryObserver : public ExtensionRegistryObserver {
|
| class Waiter;
|
|
|
| // ExtensionRegistryObserver.
|
| - virtual void OnExtensionWillBeInstalled(
|
| - content::BrowserContext* browser_context,
|
| - const Extension* extension,
|
| - bool is_update,
|
| - bool from_ephemeral,
|
| - const std::string& old_name) override;
|
| - virtual void OnExtensionUninstalled(
|
| - content::BrowserContext* browser_context,
|
| - const Extension* extension,
|
| - extensions::UninstallReason reason) override;
|
| - virtual void OnExtensionLoaded(content::BrowserContext* browser_context,
|
| - const Extension* extension) override;
|
| - virtual void OnExtensionUnloaded(
|
| - content::BrowserContext* browser_context,
|
| - const Extension* extension,
|
| - UnloadedExtensionInfo::Reason reason) override;
|
| + void OnExtensionWillBeInstalled(content::BrowserContext* browser_context,
|
| + const Extension* extension,
|
| + bool is_update,
|
| + bool from_ephemeral,
|
| + const std::string& old_name) override;
|
| + void OnExtensionUninstalled(content::BrowserContext* browser_context,
|
| + const Extension* extension,
|
| + extensions::UninstallReason reason) override;
|
| + void OnExtensionLoaded(content::BrowserContext* browser_context,
|
| + const Extension* extension) override;
|
| + void OnExtensionUnloaded(content::BrowserContext* browser_context,
|
| + const Extension* extension,
|
| + UnloadedExtensionInfo::Reason reason) override;
|
|
|
| scoped_ptr<Waiter> will_be_installed_waiter_;
|
| scoped_ptr<Waiter> uninstalled_waiter_;
|
|
|