content/browser/media/encrypted_media_browsertest.cc - Issue 12237003: Renaming the CdmWrapper build targets.

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

Issue 12237003: Renaming the CdmWrapper build targets. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Wording change Created 7 years, 10 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 | « chrome/chrome_exe.gypi ('k') | content/content_tests.gypi » ('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 "base/basictypes.h"	5 #include "base/basictypes.h"

6 #include "base/command_line.h"	6 #include "base/command_line.h"

7 #include "base/file_util.h"	7 #include "base/file_util.h"

8 #include "base/path_service.h"	8 #include "base/path_service.h"

9 #include "base/string16.h"	9 #include "base/string16.h"

10 #include "base/string_util.h"	10 #include "base/string_util.h"

11 #include "base/stringprintf.h"	11 #include "base/stringprintf.h"

12 #include "base/utf_string_conversions.h"	12 #include "base/utf_string_conversions.h"

13 #include "content/browser/web_contents/web_contents_impl.h"	13 #include "content/browser/web_contents/web_contents_impl.h"

14 #include "content/public/common/content_switches.h"	14 #include "content/public/common/content_switches.h"

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

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

17 #include "content/test/content_browser_test.h"	17 #include "content/test/content_browser_test.h"

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

19 #include "googleurl/src/gurl.h"	19 #include "googleurl/src/gurl.h"

20 #include "media/base/media_switches.h"	20 #include "media/base/media_switches.h"

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

22	22

23 // Platform-specific filename relative to the chrome executable.	23 // Platform-specific filename relative to the chrome executable.

24 #if defined(OS_WIN)	24 #if defined(OS_WIN)

25 static const wchar_t kLibraryName[] = L"clearkeycdmplugin.dll";	25 static const wchar_t kLibraryName[] = L"clearkeycdmadapter.dll";

26 #elif defined(OS_MACOSX)	26 #elif defined(OS_MACOSX)

27 static const char kLibraryName[] = "clearkeycdmplugin.plugin";	27 static const char kLibraryName[] = "clearkeycdmadapter.plugin";

28 #elif defined(OS_POSIX)	28 #elif defined(OS_POSIX)

29 static const char kLibraryName[] = "libclearkeycdmplugin.so";	29 static const char kLibraryName[] = "libclearkeycdmadapter.so";

30 #endif	30 #endif

31	31

32 // Available key systems.	32 // Available key systems.

33 static const char kClearKeyKeySystem[] = "webkit-org.w3.clearkey";	33 static const char kClearKeyKeySystem[] = "webkit-org.w3.clearkey";

34 static const char kExternalClearKeyKeySystem[] =	34 static const char kExternalClearKeyKeySystem[] =

35 "org.chromium.externalclearkey";	35 "org.chromium.externalclearkey";

36	36

37 static const char kWebMAudioOnly[] = "audio/webm; codecs=\"vorbis\"";	37 static const char kWebMAudioOnly[] = "audio/webm; codecs=\"vorbis\"";

38 static const char kWebMVideoOnly[] = "video/webm; codecs=\"vp8\"";	38 static const char kWebMVideoOnly[] = "video/webm; codecs=\"vp8\"";

39 static const char kWebMAudioVideo[] = "video/webm; codecs=\"vorbis, vp8\"";	39 static const char kWebMAudioVideo[] = "video/webm; codecs=\"vorbis, vp8\"";

(...skipping 151 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
191 TestSimplePlayback("bear-320x240-av-enc_v.webm", kWebMAudioVideo,	191 TestSimplePlayback("bear-320x240-av-enc_v.webm", kWebMAudioVideo,

192 GetParam(), kExpected));	192 GetParam(), kExpected));

193 }	193 }

194	194

195 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, FrameChangeVideo) {	195 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, FrameChangeVideo) {

196 const string16 kExpected = ASCIIToUTF16("ENDED");	196 const string16 kExpected = ASCIIToUTF16("ENDED");

197 ASSERT_NO_FATAL_FAILURE(TestFrameSizeChange(GetParam(), kExpected));	197 ASSERT_NO_FATAL_FAILURE(TestFrameSizeChange(GetParam(), kExpected));

198 }	198 }

199	199

200 } // namespace content	200 } // namespace content

OLD	NEW