Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(289)

Side by Side Diff: content/renderer/media/render_media_client_unittest.cc

Issue 1005903003: Implement robustness strings in requestMediaKeySystemAccess(). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Change parameter names. Created 5 years, 9 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
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "base/test/simple_test_tick_clock.h" 8 #include "base/test/simple_test_tick_clock.h"
9 #include "content/public/renderer/content_renderer_client.h" 9 #include "content/public/renderer/content_renderer_client.h"
10 #include "content/renderer/media/render_media_client.h" 10 #include "content/renderer/media/render_media_client.h"
11 #include "content/test/test_content_client.h" 11 #include "content/test/test_content_client.h"
12 #include "testing/gtest/include/gtest/gtest.h" 12 #include "testing/gtest/include/gtest/gtest.h"
13 13
14 #include "widevine_cdm_version.h" // In SHARED_INTERMEDIATE_DIR. 14 #include "widevine_cdm_version.h" // In SHARED_INTERMEDIATE_DIR.
15 15
16 namespace content { 16 namespace content {
17 17
18 namespace { 18 namespace {
19 19
20 class TestContentRendererClient : public ContentRendererClient { 20 class TestContentRendererClient : public ContentRendererClient {
21 public: 21 public:
22 TestContentRendererClient() : is_extra_key_system_enabled_(false) {} 22 TestContentRendererClient() : is_extra_key_system_enabled_(false) {}
23 23
24 // ContentRendererClient implementation. 24 // ContentRendererClient implementation.
25 void AddKeySystems( 25 void AddKeySystems(
26 std::vector<media::KeySystemInfo>* key_systems_info) override { 26 std::vector<media::KeySystemInfo>* key_systems_info) override {
27 // TODO(sandersd): Was this supposed to be added to the list? 27 // TODO(sandersd): Was this supposed to be added to the list?
28 media::KeySystemInfo key_system_info; 28 media::KeySystemInfo key_system_info;
29 key_system_info.key_system = "test.keysystem"; 29 key_system_info.key_system = "test.keysystem";
30 key_system_info.max_audio_robustness = media::EmeRobustness::EMPTY;
31 key_system_info.max_video_robustness = media::EmeRobustness::EMPTY;
30 key_system_info.persistent_license_support = 32 key_system_info.persistent_license_support =
31 media::EME_SESSION_TYPE_NOT_SUPPORTED; 33 media::EME_SESSION_TYPE_NOT_SUPPORTED;
32 key_system_info.persistent_release_message_support = 34 key_system_info.persistent_release_message_support =
33 media::EME_SESSION_TYPE_NOT_SUPPORTED; 35 media::EME_SESSION_TYPE_NOT_SUPPORTED;
34 key_system_info.persistent_state_support = 36 key_system_info.persistent_state_support =
35 media::EME_FEATURE_NOT_SUPPORTED; 37 media::EME_FEATURE_NOT_SUPPORTED;
36 key_system_info.distinctive_identifier_support = 38 key_system_info.distinctive_identifier_support =
37 media::EME_FEATURE_NOT_SUPPORTED; 39 media::EME_FEATURE_NOT_SUPPORTED;
38 key_systems_info->push_back(key_system_info); 40 key_systems_info->push_back(key_system_info);
39 #if defined(WIDEVINE_CDM_AVAILABLE) && defined(WIDEVINE_CDM_IS_COMPONENT) 41 #if defined(WIDEVINE_CDM_AVAILABLE) && defined(WIDEVINE_CDM_IS_COMPONENT)
40 if (is_extra_key_system_enabled_) { 42 if (is_extra_key_system_enabled_) {
41 media::KeySystemInfo wv_key_system_info; 43 media::KeySystemInfo wv_key_system_info;
42 wv_key_system_info.key_system = kWidevineKeySystem; 44 wv_key_system_info.key_system = kWidevineKeySystem;
45 wv_key_system_info.max_audio_robustness = media::EmeRobustness::EMPTY;
46 wv_key_system_info.max_video_robustness = media::EmeRobustness::EMPTY;
43 wv_key_system_info.persistent_license_support = 47 wv_key_system_info.persistent_license_support =
44 media::EME_SESSION_TYPE_NOT_SUPPORTED; 48 media::EME_SESSION_TYPE_NOT_SUPPORTED;
45 wv_key_system_info.persistent_release_message_support = 49 wv_key_system_info.persistent_release_message_support =
46 media::EME_SESSION_TYPE_NOT_SUPPORTED; 50 media::EME_SESSION_TYPE_NOT_SUPPORTED;
47 wv_key_system_info.persistent_state_support = 51 wv_key_system_info.persistent_state_support =
48 media::EME_FEATURE_NOT_SUPPORTED; 52 media::EME_FEATURE_NOT_SUPPORTED;
49 wv_key_system_info.distinctive_identifier_support = 53 wv_key_system_info.distinctive_identifier_support =
50 media::EME_FEATURE_NOT_SUPPORTED; 54 media::EME_FEATURE_NOT_SUPPORTED;
51 key_systems_info->push_back(wv_key_system_info); 55 key_systems_info->push_back(wv_key_system_info);
52 } 56 }
(...skipping 100 matching lines...) Expand 10 before | Expand all | Expand 10 after
153 157
154 EXPECT_FALSE(render_media_client_->IsKeySystemsUpdateNeeded()); 158 EXPECT_FALSE(render_media_client_->IsKeySystemsUpdateNeeded());
155 tick_clock->Advance(base::TimeDelta::FromMilliseconds(1000)); 159 tick_clock->Advance(base::TimeDelta::FromMilliseconds(1000));
156 EXPECT_FALSE(render_media_client_->IsKeySystemsUpdateNeeded()); 160 EXPECT_FALSE(render_media_client_->IsKeySystemsUpdateNeeded());
157 tick_clock->Advance(base::TimeDelta::FromMilliseconds(1000)); 161 tick_clock->Advance(base::TimeDelta::FromMilliseconds(1000));
158 EXPECT_FALSE(render_media_client_->IsKeySystemsUpdateNeeded()); 162 EXPECT_FALSE(render_media_client_->IsKeySystemsUpdateNeeded());
159 #endif 163 #endif
160 } 164 }
161 165
162 } // namespace content 166 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698