| Index: chrome/browser/extensions/extension_browsertest.h
|
| diff --git a/chrome/browser/extensions/extension_browsertest.h b/chrome/browser/extensions/extension_browsertest.h
|
| index 3fd53a2ac94ee59949ebfb3e9b7a95790b1de7e8..e3c54127f8cca8456ab9fc622e49d2ce77e19071 100644
|
| --- a/chrome/browser/extensions/extension_browsertest.h
|
| +++ b/chrome/browser/extensions/extension_browsertest.h
|
| @@ -51,14 +51,23 @@ class ExtensionBrowserTest : virtual public InProcessBrowserTest,
|
| // InProcessBrowserTest
|
| virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE;
|
|
|
| - const extensions::Extension* LoadExtension(const FilePath& path);
|
| + static const extensions::Extension* LoadExtension(
|
| + Browser* browser, NotificationObserver* observer, const FilePath& path);
|
| + const extensions::Extension* LoadExtension(const FilePath& path) {
|
| + return LoadExtension(browser(), this, path);
|
| + }
|
|
|
| // Same as above, but enables the extension in incognito mode first.
|
| const extensions::Extension* LoadExtensionIncognito(const FilePath& path);
|
|
|
| - const extensions::Extension* LoadExtensionWithFlags(
|
| + static const extensions::Extension* LoadExtensionWithFlags(
|
| + Browser* browser, NotificationObserver* observer,
|
| const FilePath& path, int flags);
|
|
|
| + const extensions::Extension* LoadExtensionWithFlags(
|
| + const FilePath& path, int flags) {
|
| + return LoadExtensionWithFlags(browser(), this, path, flags);
|
| + }
|
| // Loads extension and imitates that it is a component extension.
|
| const extensions::Extension* LoadExtensionAsComponent(const FilePath& path);
|
|
|
| @@ -238,7 +247,11 @@ class ExtensionBrowserTest : virtual public InProcessBrowserTest,
|
| Browser* browser,
|
| bool from_webstore);
|
|
|
| - bool WaitForExtensionViewsToLoad();
|
| + static bool WaitForExtensionViewsToLoad(
|
| + Browser* browser, NotificationObserver* observer);
|
| + bool WaitForExtensionViewsToLoad() {
|
| + return WaitForExtensionViewsToLoad(browser(), this);
|
| + }
|
|
|
| // When waiting for page action count to change, we wait until it reaches this
|
| // value.
|
|
|