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

Side by Side Diff: content/browser/media/media_browsertest.cc

Issue 325443002: Move about://-related constants from //content to //url (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Android ifx Created 6 years, 6 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
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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 "content/browser/media/media_browsertest.h" 5 #include "content/browser/media/media_browsertest.h"
6 6
7 #include "base/strings/stringprintf.h" 7 #include "base/strings/stringprintf.h"
8 #include "base/strings/utf_string_conversions.h" 8 #include "base/strings/utf_string_conversions.h"
9 #include "content/public/browser/web_contents.h" 9 #include "content/public/browser/web_contents.h"
10 #include "content/public/common/url_constants.h" 10 #include "content/public/common/url_constants.h"
(...skipping 183 matching lines...) Expand 10 before | Expand all | Expand 10 after
194 PlayAudio("bear_192kHz.wav", GetParam()); 194 PlayAudio("bear_192kHz.wav", GetParam());
195 } 195 }
196 196
197 IN_PROC_BROWSER_TEST_P(MediaTest, VideoTulipWebm) { 197 IN_PROC_BROWSER_TEST_P(MediaTest, VideoTulipWebm) {
198 PlayVideo("tulip2.webm", GetParam()); 198 PlayVideo("tulip2.webm", GetParam());
199 } 199 }
200 200
201 // Covers tear-down when navigating away as opposed to browser exiting. 201 // Covers tear-down when navigating away as opposed to browser exiting.
202 IN_PROC_BROWSER_TEST_F(MediaTest, Navigate) { 202 IN_PROC_BROWSER_TEST_F(MediaTest, Navigate) {
203 PlayVideo("bear.ogv", false); 203 PlayVideo("bear.ogv", false);
204 NavigateToURL(shell(), GURL(kAboutBlankURL)); 204 NavigateToURL(shell(), GURL(url::kAboutBlankURL));
205 EXPECT_FALSE(shell()->web_contents()->IsCrashed()); 205 EXPECT_FALSE(shell()->web_contents()->IsCrashed());
206 } 206 }
207 207
208 INSTANTIATE_TEST_CASE_P(File, MediaTest, ::testing::Values(false)); 208 INSTANTIATE_TEST_CASE_P(File, MediaTest, ::testing::Values(false));
209 INSTANTIATE_TEST_CASE_P(Http, MediaTest, ::testing::Values(true)); 209 INSTANTIATE_TEST_CASE_P(Http, MediaTest, ::testing::Values(true));
210 210
211 IN_PROC_BROWSER_TEST_F(MediaTest, MAYBE(Yuv420pTheora)) { 211 IN_PROC_BROWSER_TEST_F(MediaTest, MAYBE(Yuv420pTheora)) {
212 RunColorFormatTest("yuv420p.ogv", "ENDED"); 212 RunColorFormatTest("yuv420p.ogv", "ENDED");
213 } 213 }
214 214
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
246 } 246 }
247 247
248 #if defined(OS_CHROMEOS) 248 #if defined(OS_CHROMEOS)
249 IN_PROC_BROWSER_TEST_F(MediaTest, Yuv420pMpeg4) { 249 IN_PROC_BROWSER_TEST_F(MediaTest, Yuv420pMpeg4) {
250 RunColorFormatTest("yuv420p.avi", "ENDED"); 250 RunColorFormatTest("yuv420p.avi", "ENDED");
251 } 251 }
252 #endif // defined(OS_CHROMEOS) 252 #endif // defined(OS_CHROMEOS)
253 #endif // defined(USE_PROPRIETARY_CODECS) 253 #endif // defined(USE_PROPRIETARY_CODECS)
254 254
255 } // namespace content 255 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698