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

Side by Side Diff: content/browser/encrypted_media_browsertest.cc

Issue 12049068: Disable FrameChangeVideo properly (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 11 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/basictypes.h" 5 #include "base/basictypes.h"
6 #include "base/command_line.h" 6 #include "base/command_line.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/string16.h" 9 #include "base/string16.h"
10 #include "base/string_util.h" 10 #include "base/string_util.h"
(...skipping 146 matching lines...) Expand 10 before | Expand all | Expand 10 after
157 GetParam(), kExpected)); 157 GetParam(), kExpected));
158 } 158 }
159 159
160 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, BasicPlayback_VideoClearAudio) { 160 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, BasicPlayback_VideoClearAudio) {
161 const string16 kExpected = ASCIIToUTF16("ENDED"); 161 const string16 kExpected = ASCIIToUTF16("ENDED");
162 ASSERT_NO_FATAL_FAILURE( 162 ASSERT_NO_FATAL_FAILURE(
163 TestSimplePlayback("bear-320x240-av-enc_v.webm", kWebMAudioVideo, 163 TestSimplePlayback("bear-320x240-av-enc_v.webm", kWebMAudioVideo,
164 GetParam(), kExpected)); 164 GetParam(), kExpected));
165 } 165 }
166 166
167 #if defined(OS_WIN) 167 #if !defined(OS_WIN)
168 // Times out on Windows. http://crbug.com/171937 168 // Times out on Windows. http://crbug.com/171937
169 #define MAYBE_FrameChangeVideo DISABLED_FrameChangeVideo 169 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, FrameChangeVideo) {
170 #else
171 #define MAYBE_FrameChangeVideo FrameChangeVideo
172 #endif
173 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, MAYBE_FrameChangeVideo) {
174 const string16 kExpected = ASCIIToUTF16("ENDED"); 170 const string16 kExpected = ASCIIToUTF16("ENDED");
175 ASSERT_NO_FATAL_FAILURE(TestFrameSizeChange(GetParam(), kExpected)); 171 ASSERT_NO_FATAL_FAILURE(TestFrameSizeChange(GetParam(), kExpected));
176 } 172 }
173 #endif
177 174
178 } // namespace content 175 } // namespace content
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