media/base/mime_util_unittest.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: media/base/mime_util_unittest.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: media/base/mime_util_unittest.cc

diff --git a/media/base/mime_util_unittest.cc b/media/base/mime_util_unittest.cc

index 3592b024fd609714a182ebd8b81f1b96c5aebc8f..a34b4b8596a8126cb1ae7a1960341c5ca57fa784 100644

--- a/media/base/mime_util_unittest.cc

+++ b/media/base/mime_util_unittest.cc

@@ -5,6 +5,7 @@

#include "base/strings/string_split.h"

#include "build/build_config.h"

#include "media/base/mime_util.h"

+#include "media/media_features.h"

#include "testing/gtest/include/gtest/gtest.h"

namespace media {

@@ -48,7 +49,7 @@ TEST(MimeUtilTest, CommonMediaMimeType) {

EXPECT_TRUE(IsSupportedMediaMimeType("audio/mpeg"));

EXPECT_TRUE(IsSupportedMediaMimeType("audio/aac"));

-#if defined(ENABLE_MPEG2TS_STREAM_PARSER)

+#if BUILDFLAG(ENABLE_MSE_MPEG2TS_STREAM_PARSER)

EXPECT_TRUE(IsSupportedMediaMimeType("video/mp2t"));

#else

EXPECT_FALSE(IsSupportedMediaMimeType("video/mp2t"));