| 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/path_service.h" | 7 #include "base/path_service.h" |
| 8 #include "base/string16.h" | 8 #include "base/string16.h" |
| 9 #include "base/string_util.h" | 9 #include "base/string_util.h" |
| 10 #include "base/stringprintf.h" | 10 #include "base/stringprintf.h" |
| 11 #include "base/utf_string_conversions.h" | 11 #include "base/utf_string_conversions.h" |
| 12 #include "content/browser/web_contents/web_contents_impl.h" | 12 #include "content/browser/web_contents/web_contents_impl.h" |
| 13 #include "content/public/common/content_switches.h" | 13 #include "content/public/common/content_switches.h" |
| 14 #include "content/public/test/browser_test_utils.h" | 14 #include "content/public/test/browser_test_utils.h" |
| 15 #include "content/shell/shell.h" | 15 #include "content/shell/shell.h" |
| 16 #include "content/test/content_browser_test.h" | 16 #include "content/test/content_browser_test.h" |
| 17 #include "content/test/content_browser_test_utils.h" | 17 #include "content/test/content_browser_test_utils.h" |
| 18 #include "googleurl/src/gurl.h" | 18 #include "googleurl/src/gurl.h" |
| 19 #include "webkit/media/crypto/key_systems.h" | 19 #include "webkit/media/crypto/key_systems.h" |
| 20 #include "webkit/media/media_switches.h" |
| 20 | 21 |
| 21 // Platform-specific filename relative to the chrome executable. | 22 // Platform-specific filename relative to the chrome executable. |
| 22 #if defined(OS_WIN) | 23 #if defined(OS_WIN) |
| 23 static const wchar_t kLibraryName[] = L"clearkeycdmplugin.dll"; | 24 static const wchar_t kLibraryName[] = L"clearkeycdmplugin.dll"; |
| 24 #elif defined(OS_MACOSX) | 25 #elif defined(OS_MACOSX) |
| 25 static const char kLibraryName[] = "clearkeycdmplugin.plugin"; | 26 static const char kLibraryName[] = "clearkeycdmplugin.plugin"; |
| 26 #elif defined(OS_POSIX) | 27 #elif defined(OS_POSIX) |
| 27 static const char kLibraryName[] = "libclearkeycdmplugin.so"; | 28 static const char kLibraryName[] = "libclearkeycdmplugin.so"; |
| 28 #endif | 29 #endif |
| 29 | 30 |
| (...skipping 136 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 166 TestSimplePlayback("bear-320x240-av-enc_v.webm", kWebMAudioVideo, | 167 TestSimplePlayback("bear-320x240-av-enc_v.webm", kWebMAudioVideo, |
| 167 GetParam(), kExpected)); | 168 GetParam(), kExpected)); |
| 168 } | 169 } |
| 169 | 170 |
| 170 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, FrameChangeVideo) { | 171 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, FrameChangeVideo) { |
| 171 const string16 kExpected = ASCIIToUTF16("ENDED"); | 172 const string16 kExpected = ASCIIToUTF16("ENDED"); |
| 172 ASSERT_NO_FATAL_FAILURE(TestFrameSizeChange(GetParam(), kExpected)); | 173 ASSERT_NO_FATAL_FAILURE(TestFrameSizeChange(GetParam(), kExpected)); |
| 173 } | 174 } |
| 174 | 175 |
| 175 } // namespace content | 176 } // namespace content |
| OLD | NEW |