summaryrefslogtreecommitdiffstats
path: root/chrome/browser/extensions/extension_browsertest.h
diff options
context:
space:
mode:
authorphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-02-10 13:10:03 +0000
committerphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-02-10 13:10:03 +0000
commitd818e07fb7b4e680de9a38ad7af55ba04acb2cbf (patch)
tree6be52cdcff66f0c5972ce80feef7dbcf392ad899 /chrome/browser/extensions/extension_browsertest.h
parentd267ee95429eca5bff2e2d499725ca222848a1cf (diff)
downloadchromium_src-d818e07fb7b4e680de9a38ad7af55ba04acb2cbf.zip
chromium_src-d818e07fb7b4e680de9a38ad7af55ba04acb2cbf.tar.gz
chromium_src-d818e07fb7b4e680de9a38ad7af55ba04acb2cbf.tar.bz2
Remove poll'n'loop code from extension_browsertest.cc.
Also use a common wait function from extension_browsertest in the page action popup test. BUG=34339 TEST=browser_tests Review URL: http://codereview.chromium.org/582013 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@38615 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/extension_browsertest.h')
-rw-r--r--chrome/browser/extensions/extension_browsertest.h10
1 files changed, 10 insertions, 0 deletions
diff --git a/chrome/browser/extensions/extension_browsertest.h b/chrome/browser/extensions/extension_browsertest.h
index c0534d1..a284607 100644
--- a/chrome/browser/extensions/extension_browsertest.h
+++ b/chrome/browser/extensions/extension_browsertest.h
@@ -20,6 +20,8 @@
class ExtensionBrowserTest
: public InProcessBrowserTest, public NotificationObserver {
protected:
+ ExtensionBrowserTest();
+
virtual void SetUpCommandLine(CommandLine* command_line);
bool LoadExtension(const FilePath& path);
@@ -89,6 +91,14 @@ class ExtensionBrowserTest
int expected_change);
bool WaitForExtensionHostsToLoad();
+
+ // When waiting for page action count to change, we wait until it reaches this
+ // value.
+ int target_page_action_count_;
+
+ // When waiting for visible page action count to change, we wait until it
+ // reaches this value.
+ int target_visible_page_action_count_;
};
#endif // CHROME_BROWSER_EXTENSIONS_EXTENSION_BROWSERTEST_H_