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

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

Issue 16408017: Use a direct include of utf_string_conversions.h in content/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 7 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/stringprintf.h" 7 #include "base/stringprintf.h"
8 #include "base/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/test/browser_test_utils.h" 10 #include "content/public/test/browser_test_utils.h"
11 #include "content/shell/shell.h" 11 #include "content/shell/shell.h"
12 #include "content/test/content_browser_test_utils.h" 12 #include "content/test/content_browser_test_utils.h"
13 13
14 // TODO(wolenetz): Fix Media.YUV* tests on MSVS 2012 x64. crbug.com/180074 14 // TODO(wolenetz): Fix Media.YUV* tests on MSVS 2012 x64. crbug.com/180074
15 #if defined(OS_WIN) && defined(ARCH_CPU_X86_64) && _MSC_VER == 1700 15 #if defined(OS_WIN) && defined(ARCH_CPU_X86_64) && _MSC_VER == 1700
16 #define MAYBE(x) DISABLED_##x 16 #define MAYBE(x) DISABLED_##x
17 #else 17 #else
18 #define MAYBE(x) x 18 #define MAYBE(x) x
(...skipping 208 matching lines...) Expand 10 before | Expand all | Expand 10 after
227 } 227 }
228 228
229 #if defined(OS_CHROMEOS) 229 #if defined(OS_CHROMEOS)
230 IN_PROC_BROWSER_TEST_F(MediaTest, Yuv420pMpeg4) { 230 IN_PROC_BROWSER_TEST_F(MediaTest, Yuv420pMpeg4) {
231 RunColorFormatTest("yuv420p.avi", "ENDED"); 231 RunColorFormatTest("yuv420p.avi", "ENDED");
232 } 232 }
233 #endif 233 #endif
234 #endif 234 #endif
235 235
236 } // namespace content 236 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/media/encrypted_media_browsertest.cc ('k') | content/browser/media/webrtc_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698