Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(270)

Unified Diff: chrome/browser/extensions/api/media_galleries/media_galleries_apitest.cc

Issue 10986024: Disable MediaGalleriesNoAccess and MediaGalleriesRead browser tests (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: update to scope to windows only Created 8 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/extensions/api/media_galleries/media_galleries_apitest.cc
diff --git a/chrome/browser/extensions/api/media_galleries/media_galleries_apitest.cc b/chrome/browser/extensions/api/media_galleries/media_galleries_apitest.cc
index c7bd6f913097b167a3e7e7307e7a077fe5308e2f..e45345ff411f0846e3bce48ba38f7b690b8d736b 100644
--- a/chrome/browser/extensions/api/media_galleries/media_galleries_apitest.cc
+++ b/chrome/browser/extensions/api/media_galleries/media_galleries_apitest.cc
@@ -93,13 +93,26 @@ IN_PROC_BROWSER_TEST_F(PlatformAppBrowserTest, NoGalleries) {
<< message_;
}
-IN_PROC_BROWSER_TEST_F(PlatformAppBrowserTest, MediaGalleriesRead) {
+// Flaky on WinXP - crbug.com/152185.
+#if defined(OS_WIN)
+#define MAYBE_MediaGalleriesRead DISABLED_MediaGalleriesRead
+#else
+#define MAYBE_MediaGalleriesRead MediaGalleriesRead
+#endif // defined(OS_WIN)
+IN_PROC_BROWSER_TEST_F(PlatformAppBrowserTest, MAYBE_MediaGalleriesRead) {
EnsurePictureDirectoryExists picture_directory;
ASSERT_TRUE(RunPlatformAppTest("api_test/media_galleries/read_access"))
<< message_;
}
-IN_PROC_BROWSER_TEST_F(PlatformAppBrowserTest, MediaGalleriesNoAccess) {
+// Flaky on WinXP - crbug.com/152185.
+#if defined(OS_WIN)
+#define MAYBE_MediaGalleriesNoAccess DISABLED_MediaGalleriesNoAccess
+#else
+#define MAYBE_MediaGalleriesNoAccess MediaGalleriesNoAccess
+#endif // defined(OS_WIN)
+IN_PROC_BROWSER_TEST_F(PlatformAppBrowserTest,
+ MAYBE_MediaGalleriesNoAccess) {
EnsurePictureDirectoryExists picture_directory;
ASSERT_TRUE(RunPlatformAppTest("api_test/media_galleries/no_access"))
<< message_;
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698