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

Side by Side 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, 2 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "base/command_line.h" 5 #include "base/command_line.h"
6 #include "base/file_path.h" 6 #include "base/file_path.h"
7 #include "base/file_util.h" 7 #include "base/file_util.h"
8 #include "base/path_service.h" 8 #include "base/path_service.h"
9 #include "base/stringprintf.h" 9 #include "base/stringprintf.h"
10 #include "chrome/browser/extensions/extension_apitest.h" 10 #include "chrome/browser/extensions/extension_apitest.h"
(...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after
86 }; 86 };
87 87
88 88
89 } // namespace 89 } // namespace
90 90
91 IN_PROC_BROWSER_TEST_F(PlatformAppBrowserTest, NoGalleries) { 91 IN_PROC_BROWSER_TEST_F(PlatformAppBrowserTest, NoGalleries) {
92 ASSERT_TRUE(RunPlatformAppTest("api_test/media_galleries/no_galleries")) 92 ASSERT_TRUE(RunPlatformAppTest("api_test/media_galleries/no_galleries"))
93 << message_; 93 << message_;
94 } 94 }
95 95
96 IN_PROC_BROWSER_TEST_F(PlatformAppBrowserTest, MediaGalleriesRead) { 96 // Flaky on WinXP - crbug.com/152185.
97 #if defined(OS_WIN)
98 #define MAYBE_MediaGalleriesRead DISABLED_MediaGalleriesRead
99 #else
100 #define MAYBE_MediaGalleriesRead MediaGalleriesRead
101 #endif // defined(OS_WIN)
102 IN_PROC_BROWSER_TEST_F(PlatformAppBrowserTest, MAYBE_MediaGalleriesRead) {
97 EnsurePictureDirectoryExists picture_directory; 103 EnsurePictureDirectoryExists picture_directory;
98 ASSERT_TRUE(RunPlatformAppTest("api_test/media_galleries/read_access")) 104 ASSERT_TRUE(RunPlatformAppTest("api_test/media_galleries/read_access"))
99 << message_; 105 << message_;
100 } 106 }
101 107
102 IN_PROC_BROWSER_TEST_F(PlatformAppBrowserTest, MediaGalleriesNoAccess) { 108 // Flaky on WinXP - crbug.com/152185.
109 #if defined(OS_WIN)
110 #define MAYBE_MediaGalleriesNoAccess DISABLED_MediaGalleriesNoAccess
111 #else
112 #define MAYBE_MediaGalleriesNoAccess MediaGalleriesNoAccess
113 #endif // defined(OS_WIN)
114 IN_PROC_BROWSER_TEST_F(PlatformAppBrowserTest,
115 MAYBE_MediaGalleriesNoAccess) {
103 EnsurePictureDirectoryExists picture_directory; 116 EnsurePictureDirectoryExists picture_directory;
104 ASSERT_TRUE(RunPlatformAppTest("api_test/media_galleries/no_access")) 117 ASSERT_TRUE(RunPlatformAppTest("api_test/media_galleries/no_access"))
105 << message_; 118 << message_;
106 } 119 }
107 120
108 IN_PROC_BROWSER_TEST_F(ExperimentalMediaGalleriesApiTest, 121 IN_PROC_BROWSER_TEST_F(ExperimentalMediaGalleriesApiTest,
109 ExperimentalMediaGalleries) { 122 ExperimentalMediaGalleries) {
110 ASSERT_TRUE(RunExtensionTest("media_galleries/experimental")) << message_; 123 ASSERT_TRUE(RunExtensionTest("media_galleries/experimental")) << message_;
111 } 124 }
OLDNEW
« 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