diff options
| author | Jochen Eisinger <jochen@chromium.org> | 2015-08-03 09:16:33 +0200 |
|---|---|---|
| committer | Jochen Eisinger <jochen@chromium.org> | 2015-08-03 07:18:35 +0000 |
| commit | 63af588c0c394e932bcd56adc06329349809a07b (patch) | |
| tree | d2108616cce83d22ea94dcd501f3e811ef1d9b54 | |
| parent | a8f9e873e6df4f8194700540b5968449e6d3098c (diff) | |
| download | chromium_src-63af588c0c394e932bcd56adc06329349809a07b.zip chromium_src-63af588c0c394e932bcd56adc06329349809a07b.tar.gz chromium_src-63af588c0c394e932bcd56adc06329349809a07b.tar.bz2 | |
Disable tests that fail on WinXP
BUG=515717
TBR=battre@chromium.org,jyasskin@chromium.org
Review URL: https://codereview.chromium.org/1266343002 .
Cr-Commit-Position: refs/heads/master@{#341494}
| -rw-r--r-- | chrome/browser/extensions/api/declarative_content/declarative_content_apitest.cc | 9 | ||||
| -rw-r--r-- | chrome/browser/extensions/api/extension_action/browser_action_interactive_test.cc | 10 |
2 files changed, 17 insertions, 2 deletions
diff --git a/chrome/browser/extensions/api/declarative_content/declarative_content_apitest.cc b/chrome/browser/extensions/api/declarative_content/declarative_content_apitest.cc index f21802c..648a369 100644 --- a/chrome/browser/extensions/api/declarative_content/declarative_content_apitest.cc +++ b/chrome/browser/extensions/api/declarative_content/declarative_content_apitest.cc @@ -532,8 +532,15 @@ IN_PROC_BROWSER_TEST_F(DeclarativeContentApiTest, RulesPersistence) { } // http://crbug.com/304373 +#if defined(OS_WIN) +// Fails on XP: http://crbug.com/515717 +#define MAYBE_UninstallWhileActivePageAction \ + DISABLED_UninstallWhileActivePageAction +#else +#define MAYBE_UninstallWhileActivePageAction UninstallWhileActivePageAction +#endif IN_PROC_BROWSER_TEST_F(DeclarativeContentApiTest, - UninstallWhileActivePageAction) { + MAYBE_UninstallWhileActivePageAction) { ext_dir_.WriteManifest(kDeclarativeContentManifest); ext_dir_.WriteFile(FILE_PATH_LITERAL("background.js"), kBackgroundHelpers); const Extension* extension = LoadExtension(ext_dir_.unpacked_path()); diff --git a/chrome/browser/extensions/api/extension_action/browser_action_interactive_test.cc b/chrome/browser/extensions/api/extension_action/browser_action_interactive_test.cc index 4fdf96e..8d1b322 100644 --- a/chrome/browser/extensions/api/extension_action/browser_action_interactive_test.cc +++ b/chrome/browser/extensions/api/extension_action/browser_action_interactive_test.cc @@ -151,8 +151,16 @@ IN_PROC_BROWSER_TEST_F(BrowserActionInteractiveTest, TestOpenPopupIncognito) { // Tests that an extension can open a popup in the last active incognito window // even from a background page with a non-incognito profile. // (crbug.com/448853) +#if defined(OS_WIN) +// Fails on XP: http://crbug.com/515717 +#define MAYBE_TestOpenPopupIncognitoFromBackground \ + DISABLED_TestOpenPopupIncognitoFromBackground +#else +#define MAYBE_TestOpenPopupIncognitoFromBackground \ + TestOpenPopupIncognitoFromBackground +#endif IN_PROC_BROWSER_TEST_F(BrowserActionInteractiveTest, - TestOpenPopupIncognitoFromBackground) { + MAYBE_TestOpenPopupIncognitoFromBackground) { if (!ShouldRunPopupTest()) return; |