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

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

Issue 2643333002: Convert USE_PROPRIETARY_CODECS to a buildflag header. (Closed)
Patch Set: Created 3 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
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 <string> 5 #include <string>
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/macros.h" 8 #include "base/macros.h"
9 #include "base/strings/string_util.h" 9 #include "base/strings/string_util.h"
10 #include "build/build_config.h" 10 #include "build/build_config.h"
11 #include "content/browser/media/media_browsertest.h" 11 #include "content/browser/media/media_browsertest.h"
12 #include "content/public/test/browser_test_utils.h" 12 #include "content/public/test/browser_test_utils.h"
13 #include "content/public/test/content_browser_test_utils.h" 13 #include "content/public/test/content_browser_test_utils.h"
14 #include "content/shell/browser/shell.h" 14 #include "content/shell/browser/shell.h"
15 #include "media/base/media_switches.h" 15 #include "media/base/media_switches.h"
16 #include "media/media_features.h" 16 #include "media/media_features.h"
17 17
18 #if defined(OS_ANDROID) 18 #if defined(OS_ANDROID)
19 #include "base/android/build_info.h" 19 #include "base/android/build_info.h"
20 #endif 20 #endif
21 21
22 const char kProbably[] = "probably"; 22 const char kProbably[] = "probably";
23 const char kMaybe[] = "maybe"; 23 const char kMaybe[] = "maybe";
24 const char kNot[] = ""; 24 const char kNot[] = "";
25 25
26 #if defined(USE_PROPRIETARY_CODECS) 26 #if BUILDFLAG(USE_PROPRIETARY_CODECS)
27 const char* kPropProbably = kProbably; 27 const char* kPropProbably = kProbably;
28 const char* kPropMaybe = kMaybe; 28 const char* kPropMaybe = kMaybe;
29 #else 29 #else
30 const char* kPropProbably = kNot; 30 const char* kPropProbably = kNot;
31 const char* kPropMaybe = kNot; 31 const char* kPropMaybe = kNot;
32 #endif // USE_PROPRIETARY_CODECS 32 #endif // USE_PROPRIETARY_CODECS
33 33
34 #if !defined(OS_ANDROID) 34 #if !defined(OS_ANDROID)
35 const char* kOggVideoProbably = kProbably; 35 const char* kOggVideoProbably = kProbably;
36 const char* kOggVideoMaybe = kMaybe; 36 const char* kOggVideoMaybe = kMaybe;
(...skipping 1528 matching lines...) Expand 10 before | Expand all | Expand 10 after
1565 CanPlay("'video/mp4; codecs=\"vp09.02.01.08.02.01.01.00\"'")); 1565 CanPlay("'video/mp4; codecs=\"vp09.02.01.08.02.01.01.00\"'"));
1566 EXPECT_EQ(mp4_vp9_maybe, 1566 EXPECT_EQ(mp4_vp9_maybe,
1567 CanPlay("'video/mp4; codecs=\"vp09.03.01.08.02.01.01.00\"'")); 1567 CanPlay("'video/mp4; codecs=\"vp09.03.01.08.02.01.01.00\"'"));
1568 } 1568 }
1569 1569
1570 INSTANTIATE_TEST_CASE_P(EnableDisableMp4Vp9Demuxing, 1570 INSTANTIATE_TEST_CASE_P(EnableDisableMp4Vp9Demuxing,
1571 MediaCanPlayTypeTestMp4Vp9Demuxing, 1571 MediaCanPlayTypeTestMp4Vp9Demuxing,
1572 ::testing::Bool()); 1572 ::testing::Bool());
1573 1573
1574 } // namespace content 1574 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/media/media_browsertest.cc ('k') | content/browser/media/media_color_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698