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

Side by Side Diff: chrome/browser/media_uitest.cc

Issue 8536024: Correct MediaUILayoutTest expectations. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 1 month 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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/basictypes.h" 5 #include "base/basictypes.h"
6 #include "base/file_path.h" 6 #include "base/file_path.h"
7 #include "base/stringprintf.h" 7 #include "base/stringprintf.h"
8 #include "base/string_util.h" 8 #include "base/string_util.h"
9 #include "base/test/test_timeouts.h" 9 #include "base/test/test_timeouts.h"
10 #include "base/threading/platform_thread.h" 10 #include "base/threading/platform_thread.h"
(...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after
125 TEST_F(MediaTest, VideoBearFlac) { 125 TEST_F(MediaTest, VideoBearFlac) {
126 PlayVideo("bear.flac"); 126 PlayVideo("bear.flac");
127 } 127 }
128 #endif 128 #endif
129 #endif 129 #endif
130 130
131 TEST_F(MediaTest, MAYBE_VideoBearWavPcm) { 131 TEST_F(MediaTest, MAYBE_VideoBearWavPcm) {
132 PlayVideo("bear_pcm.wav"); 132 PlayVideo("bear_pcm.wav");
133 } 133 }
134 134
135 #if defined(OS_MACOSX) || defined(OS_LINUX) 135 #if defined(OS_MACOSX)
136 // http://crbug.com/95274 - MediaUILayoutTest is flaky on Mac. 136 // http://crbug.com/95274
137 // http://crbug.com/103832 - MediaUILayoutTest is flaky on Linux.
138 #define MAYBE_MediaUILayoutTest FLAKY_MediaUILayoutTest 137 #define MAYBE_MediaUILayoutTest FLAKY_MediaUILayoutTest
139 #elif defined(OS_POSIX) && defined(TOOLKIT_VIEWS) 138 #elif defined(OS_LINUX) && defined(TOOLKIT_VIEWS)
139 // http://crbug.com/103832
140 #define MAYBE_MediaUILayoutTest FAILS_MediaUILayoutTest 140 #define MAYBE_MediaUILayoutTest FAILS_MediaUILayoutTest
141 #else 141 #else
142 #define MAYBE_MediaUILayoutTest MediaUILayoutTest 142 #define MAYBE_MediaUILayoutTest MediaUILayoutTest
143 #endif 143 #endif
144 144
145 TEST_F(UILayoutTest, MAYBE_MediaUILayoutTest) { 145 TEST_F(UILayoutTest, MAYBE_MediaUILayoutTest) {
146 static const char* kResources[] = { 146 static const char* kResources[] = {
147 "content", 147 "content",
148 "media-file.js", 148 "media-file.js",
149 "media-fullscreen.js", 149 "media-fullscreen.js",
(...skipping 15 matching lines...) Expand all
165 InitializeForLayoutTest(test_dir, media_test_dir, kNoHttpPort); 165 InitializeForLayoutTest(test_dir, media_test_dir, kNoHttpPort);
166 166
167 // Copy resources first. 167 // Copy resources first.
168 for (size_t i = 0; i < arraysize(kResources); ++i) 168 for (size_t i = 0; i < arraysize(kResources); ++i)
169 AddResourceForLayoutTest( 169 AddResourceForLayoutTest(
170 test_dir, media_test_dir.AppendASCII(kResources[i])); 170 test_dir, media_test_dir.AppendASCII(kResources[i]));
171 171
172 for (size_t i = 0; i < arraysize(kMediaTests); ++i) 172 for (size_t i = 0; i < arraysize(kMediaTests); ++i)
173 RunLayoutTest(kMediaTests[i], kNoHttpPort); 173 RunLayoutTest(kMediaTests[i], kNoHttpPort);
174 } 174 }
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