content/browser/media/media_canplaytype_browsertest.cc - Issue 1539983004: Convert enable_mpeg2ts into a new-style buildflag

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/browser/media/media_canplaytype_browsertest.cc

Issue 1539983004: Convert enable_mpeg2ts into a new-style buildflag (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Remove redundant ffmpeg_branding introduced by incorrect merge Created 5 years ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: content/browser/media/media_canplaytype_browsertest.cc

diff --git a/content/browser/media/media_canplaytype_browsertest.cc b/content/browser/media/media_canplaytype_browsertest.cc

index 36254bd352c7111df1fe70b66aa4bd32c0a1b78c..be0e73ea0a08c87791b72cae643d358d4d67a1b5 100644

--- a/content/browser/media/media_canplaytype_browsertest.cc

+++ b/content/browser/media/media_canplaytype_browsertest.cc

@@ -8,6 +8,7 @@

#include "content/public/test/browser_test_utils.h"

#include "content/public/test/content_browser_test_utils.h"

#include "content/shell/browser/shell.h"

+#include "media/media_features.h"

#if defined(OS_ANDROID)

#include "base/android/build_info.h"

@@ -45,7 +46,7 @@ const char* kHevcSupported = kPropProbably;

const char* kHevcSupported = kNot;

#endif

-#if defined(ENABLE_MPEG2TS_STREAM_PARSER)

+#if BUILDFLAG(ENABLE_MSE_MPEG2TS_STREAM_PARSER)

const char* kMp2tsMaybe = kPropMaybe;

const char* kMp2tsProbably = kPropProbably;

#else