| 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/strings/utf_string_conversions.h" | 6 #include "base/strings/utf_string_conversions.h" |
| 7 #include "base/win/windows_version.h" | 7 #include "base/win/windows_version.h" |
| 8 #include "build/build_config.h" | 8 #include "build/build_config.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 115 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 126 RunEncryptedMediaTest(kDefaultEmePlayer, | 126 RunEncryptedMediaTest(kDefaultEmePlayer, |
| 127 media_file, | 127 media_file, |
| 128 media_type, | 128 media_type, |
| 129 key_system, | 129 key_system, |
| 130 src_type, | 130 src_type, |
| 131 kEnded); | 131 kEnded); |
| 132 } | 132 } |
| 133 | 133 |
| 134 protected: | 134 protected: |
| 135 // We want to fail quickly when a test fails because an error is encountered. | 135 // We want to fail quickly when a test fails because an error is encountered. |
| 136 void AddWaitForTitles(content::TitleWatcher* title_watcher) override { | 136 void AddTitlesToAwait(content::TitleWatcher* title_watcher) override { |
| 137 MediaBrowserTest::AddWaitForTitles(title_watcher); | 137 MediaBrowserTest::AddTitlesToAwait(title_watcher); |
| 138 title_watcher->AlsoWaitForTitle(base::ASCIIToUTF16(kEmeNotSupportedError)); | 138 title_watcher->AlsoWaitForTitle(base::ASCIIToUTF16(kEmeNotSupportedError)); |
| 139 title_watcher->AlsoWaitForTitle(base::ASCIIToUTF16(kEmeKeyError)); | 139 title_watcher->AlsoWaitForTitle(base::ASCIIToUTF16(kEmeKeyError)); |
| 140 } | 140 } |
| 141 | 141 |
| 142 void SetUpCommandLine(base::CommandLine* command_line) override { | 142 void SetUpCommandLine(base::CommandLine* command_line) override { |
| 143 command_line->AppendSwitch( | 143 command_line->AppendSwitch( |
| 144 switches::kDisableGestureRequirementForMediaPlayback); | 144 switches::kDisableGestureRequirementForMediaPlayback); |
| 145 } | 145 } |
| 146 }; | 146 }; |
| 147 | 147 |
| (...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 209 } | 209 } |
| 210 #endif // !defined(DISABLE_ENCRYPTED_MEDIA_PLAYBACK_TESTS) | 210 #endif // !defined(DISABLE_ENCRYPTED_MEDIA_PLAYBACK_TESTS) |
| 211 | 211 |
| 212 IN_PROC_BROWSER_TEST_F(EncryptedMediaTest, UnknownKeySystemThrowsException) { | 212 IN_PROC_BROWSER_TEST_F(EncryptedMediaTest, UnknownKeySystemThrowsException) { |
| 213 RunEncryptedMediaTest(kDefaultEmePlayer, "bear-a_enc-a.webm", | 213 RunEncryptedMediaTest(kDefaultEmePlayer, "bear-a_enc-a.webm", |
| 214 kWebMVorbisAudioOnly, "com.example.foo", MSE, | 214 kWebMVorbisAudioOnly, "com.example.foo", MSE, |
| 215 kEmeNotSupportedError); | 215 kEmeNotSupportedError); |
| 216 } | 216 } |
| 217 | 217 |
| 218 } // namespace content | 218 } // namespace content |
| OLD | NEW |