| OLD | NEW |
| 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 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/command_line.h" | 5 #include "base/command_line.h" |
| 6 #include "base/path_service.h" | 6 #include "base/path_service.h" |
| 7 #include "base/strings/utf_string_conversions.h" | 7 #include "base/strings/utf_string_conversions.h" |
| 8 #include "base/win/windows_version.h" | 8 #include "base/win/windows_version.h" |
| 9 #include "content/browser/media/media_browsertest.h" | 9 #include "content/browser/media/media_browsertest.h" |
| 10 #include "content/public/common/content_switches.h" | 10 #include "content/public/common/content_switches.h" |
| (...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 109 const char* key_system, | 109 const char* key_system, |
| 110 SrcType src_type) { | 110 SrcType src_type) { |
| 111 RunEncryptedMediaTest("encrypted_media_player.html", media_file, | 111 RunEncryptedMediaTest("encrypted_media_player.html", media_file, |
| 112 media_type, key_system, src_type, kEnded); | 112 media_type, key_system, src_type, kEnded); |
| 113 } | 113 } |
| 114 | 114 |
| 115 protected: | 115 protected: |
| 116 // We want to fail quickly when a test fails because an error is encountered. | 116 // We want to fail quickly when a test fails because an error is encountered. |
| 117 virtual void AddWaitForTitles(content::TitleWatcher* title_watcher) OVERRIDE { | 117 virtual void AddWaitForTitles(content::TitleWatcher* title_watcher) OVERRIDE { |
| 118 MediaBrowserTest::AddWaitForTitles(title_watcher); | 118 MediaBrowserTest::AddWaitForTitles(title_watcher); |
| 119 title_watcher->AlsoWaitForTitle(ASCIIToUTF16(kEmeNotSupportedError)); | 119 title_watcher->AlsoWaitForTitle(base::ASCIIToUTF16(kEmeNotSupportedError)); |
| 120 title_watcher->AlsoWaitForTitle(ASCIIToUTF16(kEmeKeyError)); | 120 title_watcher->AlsoWaitForTitle(base::ASCIIToUTF16(kEmeKeyError)); |
| 121 } | 121 } |
| 122 | 122 |
| 123 #if defined(OS_ANDROID) | 123 #if defined(OS_ANDROID) |
| 124 virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { | 124 virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { |
| 125 command_line->AppendSwitch( | 125 command_line->AppendSwitch( |
| 126 switches::kDisableGestureRequirementForMediaPlayback); | 126 switches::kDisableGestureRequirementForMediaPlayback); |
| 127 } | 127 } |
| 128 #endif | 128 #endif |
| 129 }; | 129 }; |
| 130 | 130 |
| (...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 173 TestFrameSizeChange(); | 173 TestFrameSizeChange(); |
| 174 } | 174 } |
| 175 | 175 |
| 176 IN_PROC_BROWSER_TEST_F(EncryptedMediaTest, UnknownKeySystemThrowsException) { | 176 IN_PROC_BROWSER_TEST_F(EncryptedMediaTest, UnknownKeySystemThrowsException) { |
| 177 RunEncryptedMediaTest("encrypted_media_player.html", "bear-a-enc_a.webm", | 177 RunEncryptedMediaTest("encrypted_media_player.html", "bear-a-enc_a.webm", |
| 178 kWebMAudioOnly, "com.example.foo", MSE, | 178 kWebMAudioOnly, "com.example.foo", MSE, |
| 179 kEmeNotSupportedError); | 179 kEmeNotSupportedError); |
| 180 } | 180 } |
| 181 | 181 |
| 182 } // namespace content | 182 } // namespace content |
| OLD | NEW |