webkit/media/crypto/key_systems_unittest.cc - Issue 11931019: Update some #includes in webkit/media/crypto for headers that were moved from WebKit/chromium/publi…

Side by Side Diff

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

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

Side by Side Diff: webkit/media/crypto/key_systems_unittest.cc

Issue 11931019: Update some #includes in webkit/media/crypto for headers that were moved from WebKit/chromium/publi… (Closed) Base URL: http://src.chromium.org/svn/trunk/src/

Patch Set: Created 7 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 | Annotate | Revision Log

« no previous file with comments | « webkit/media/crypto/key_systems.cc ('k') | webkit/media/crypto/proxy_decryptor.cc » ('j') | no next file with comments »

OLD	NEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2012 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 #include <vector>	6 #include <vector>

7	7

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

9 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebString.h"	9 #include "third_party/WebKit/Source/Platform/chromium/public/WebString.h"

10 #include "webkit/media/crypto/key_systems.h"	10 #include "webkit/media/crypto/key_systems.h"

11	11

12 #include "widevine_cdm_version.h" // In SHARED_INTERMEDIATE_DIR.	12 #include "widevine_cdm_version.h" // In SHARED_INTERMEDIATE_DIR.

13	13

14 using WebKit::WebString;	14 using WebKit::WebString;

15	15

16 #if defined(GOOGLE_CHROME_BUILD) \|\| defined(USE_PROPRIETARY_CODECS)	16 #if defined(GOOGLE_CHROME_BUILD) \|\| defined(USE_PROPRIETARY_CODECS)

17 #define EXPECT_PROPRIETARY EXPECT_TRUE	17 #define EXPECT_PROPRIETARY EXPECT_TRUE

18 #else	18 #else

19 #define EXPECT_PROPRIETARY EXPECT_FALSE	19 #define EXPECT_PROPRIETARY EXPECT_FALSE

(...skipping 641 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
661 "audio/mp4", avc1_codec(), kWidevineAlpha));	661 "audio/mp4", avc1_codec(), kWidevineAlpha));

662 EXPECT_FALSE(IsSupportedKeySystemWithMediaMimeType(	662 EXPECT_FALSE(IsSupportedKeySystemWithMediaMimeType(

663 "audio/mp4", avc1_and_aac_codecs(), kWidevineAlpha));	663 "audio/mp4", avc1_and_aac_codecs(), kWidevineAlpha));

664	664

665 // Non-MP4 codec.	665 // Non-MP4 codec.

666 EXPECT_FALSE(IsSupportedKeySystemWithMediaMimeType(	666 EXPECT_FALSE(IsSupportedKeySystemWithMediaMimeType(

667 "audio/mp4", vorbis_codec(), kWidevineAlpha));	667 "audio/mp4", vorbis_codec(), kWidevineAlpha));

668 }	668 }

669	669

670 } // namespace webkit_media	670 } // namespace webkit_media

OLD	NEW