diff options
| author | tyoshino@chromium.org <tyoshino@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-11 07:23:04 +0000 |
|---|---|---|
| committer | tyoshino@chromium.org <tyoshino@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-11 07:23:04 +0000 |
| commit | b271a7cf0e398bc8426e7ead347f408f6f57b007 (patch) | |
| tree | f59f08971f67b918dd051fac50496fa04acd4ffc | |
| parent | f4ca9f0efe17ea2b44539874e18e29b320430554 (diff) | |
| download | chromium_src-b271a7cf0e398bc8426e7ead347f408f6f57b007.zip chromium_src-b271a7cf0e398bc8426e7ead347f408f6f57b007.tar.gz chromium_src-b271a7cf0e398bc8426e7ead347f408f6f57b007.tar.bz2 | |
Disable LazyBackgroundPageApiTest.IncognitoSplitMode and PlatformAppBrowserTest.ExtensionWindowingApis
They are flaky on XP bots.
TBR=yhirano@chromium.org
BUG=248437,248441
Review URL: https://codereview.chromium.org/16757008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@205456 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/extensions/lazy_background_page_apitest.cc | 9 | ||||
| -rw-r--r-- | chrome/browser/extensions/platform_app_browsertest.cc | 9 |
2 files changed, 16 insertions, 2 deletions
diff --git a/chrome/browser/extensions/lazy_background_page_apitest.cc b/chrome/browser/extensions/lazy_background_page_apitest.cc index faa5910..8bb4b11 100644 --- a/chrome/browser/extensions/lazy_background_page_apitest.cc +++ b/chrome/browser/extensions/lazy_background_page_apitest.cc @@ -299,9 +299,16 @@ IN_PROC_BROWSER_TEST_F(LazyBackgroundPageApiTest, MAYBE_WaitForNTP) { EXPECT_FALSE(pm->GetBackgroundHostForExtension(last_loaded_extension_id_)); } +// See crbug.com/248437 +#if defined(OS_WIN) +#define MAYBE_IncognitoSplitMode DISABLED_IncognitoSplitMode +#else +#define MAYBE_IncognitoSplitMode IncognitoSplitMode +#endif + // Tests that an incognito split mode extension gets 2 lazy background pages, // and they each load and unload at the proper times. -IN_PROC_BROWSER_TEST_F(LazyBackgroundPageApiTest, IncognitoSplitMode) { +IN_PROC_BROWSER_TEST_F(LazyBackgroundPageApiTest, MAYBE_IncognitoSplitMode) { // Open incognito window. Browser* incognito_browser = ui_test_utils::OpenURLOffTheRecord( browser()->profile(), GURL("about:blank")); diff --git a/chrome/browser/extensions/platform_app_browsertest.cc b/chrome/browser/extensions/platform_app_browsertest.cc index 21c839d..60621b6 100644 --- a/chrome/browser/extensions/platform_app_browsertest.cc +++ b/chrome/browser/extensions/platform_app_browsertest.cc @@ -371,7 +371,14 @@ IN_PROC_BROWSER_TEST_F(PlatformAppBrowserTest, Isolation) { ASSERT_TRUE(RunPlatformAppTest("platform_apps/isolation")) << message_; } -IN_PROC_BROWSER_TEST_F(PlatformAppBrowserTest, ExtensionWindowingApis) { +// See crbug.com/248441 +#if defined(OS_WIN) +#define MAYBE_ExtensionWindowingApis DISABLED_ExtensionWindowingApis +#else +#define MAYBE_ExtensionWindowingApis ExtensionWindowingApis +#endif + +IN_PROC_BROWSER_TEST_F(PlatformAppBrowserTest, MAYBE_ExtensionWindowingApis) { // Initially there should be just the one browser window visible to the // extensions API. const Extension* extension = LoadExtension( |