diff options
| author | michaeln@chromium.org <michaeln@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-15 22:21:42 +0000 |
|---|---|---|
| committer | michaeln@chromium.org <michaeln@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-15 22:21:42 +0000 |
| commit | 09d62168b2d507600cad023b79a7741d418129b3 (patch) | |
| tree | 9798a14931bf98cc67d23fb25854a82510eb7e2e /chrome/browser/extensions | |
| parent | 89996f8abca02569ef967d2b095d9ac63f04d2d5 (diff) | |
| download | chromium_src-09d62168b2d507600cad023b79a7741d418129b3.zip chromium_src-09d62168b2d507600cad023b79a7741d418129b3.tar.gz chromium_src-09d62168b2d507600cad023b79a7741d418129b3.tar.bz2 | |
ExtensionApiTest.Popup is flaky on windows.
TEST=none
BUG=46601
TBR=mpcomplete
Review URL: http://codereview.chromium.org/2868003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@49844 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions')
| -rw-r--r-- | chrome/browser/extensions/extension_popup_apitest.cc | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/chrome/browser/extensions/extension_popup_apitest.cc b/chrome/browser/extensions/extension_popup_apitest.cc index c445325..ba6a082 100644 --- a/chrome/browser/extensions/extension_popup_apitest.cc +++ b/chrome/browser/extensions/extension_popup_apitest.cc @@ -6,7 +6,14 @@ #include "chrome/browser/extensions/extension_apitest.h" #include "chrome/common/chrome_switches.h" -IN_PROC_BROWSER_TEST_F(ExtensionApiTest, Popup) { +// Flaky on windows. http://crbug.com/46601 +#if defined(OS_WIN) +#define MAYBE_Popup FLAKY_Popup +#else +#define MAYBE_Popup Popup +#endif + +IN_PROC_BROWSER_TEST_F(ExtensionApiTest, MAYBE_Popup) { CommandLine::ForCurrentProcess()->AppendSwitch( switches::kEnableExperimentalExtensionApis); CommandLine::ForCurrentProcess()->AppendSwitch( |