media/filters/chunk_demuxer_unittest.cc - Issue 23205006: Define proprietary_codecs=1 when branding==Chrome.

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/filters/chunk_demuxer_unittest.cc

Issue 23205006: Define proprietary_codecs=1 when branding==Chrome. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase onto lkgr Created 7 years, 4 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:

Index: media/filters/chunk_demuxer_unittest.cc

diff --git a/media/filters/chunk_demuxer_unittest.cc b/media/filters/chunk_demuxer_unittest.cc

index e3a84e66d35ed44dc1ccb01aefeb9ddf53bf882e..7f88a6156494054287a1a1900aadac01853dc1c4 100644

--- a/media/filters/chunk_demuxer_unittest.cc

+++ b/media/filters/chunk_demuxer_unittest.cc

@@ -2014,7 +2014,7 @@ TEST_F(ChunkDemuxerTest, ClusterWithNoBuffers) {

TEST_F(ChunkDemuxerTest, CodecPrefixMatching) {

ChunkDemuxer::Status expected = ChunkDemuxer::kNotSupported;

-#if defined(GOOGLE_CHROME_BUILD) || defined(USE_PROPRIETARY_CODECS)

+#if defined(USE_PROPRIETARY_CODECS)

expected = ChunkDemuxer::kOk;

#endif

@@ -2029,7 +2029,7 @@ TEST_F(ChunkDemuxerTest, CodecPrefixMatching) {

TEST_F(ChunkDemuxerTest, CodecIDsThatAreNotRFC6381Compliant) {

ChunkDemuxer::Status expected = ChunkDemuxer::kNotSupported;

-#if defined(GOOGLE_CHROME_BUILD) || defined(USE_PROPRIETARY_CODECS)

+#if defined(USE_PROPRIETARY_CODECS)

expected = ChunkDemuxer::kOk;

#endif

const char* codec_ids[] = {