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

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

Issue 1712903002: Remove prefixed EME. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix isRenewalMessage() in browser tests. Created 4 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
« no previous file with comments | « content/renderer/media/cdm/render_cdm_factory.cc ('k') | content/renderer/render_frame_impl.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 "content/renderer/media/render_media_client.h" 5 #include "content/renderer/media/render_media_client.h"
6 6
7 #include "base/lazy_instance.h" 7 #include "base/lazy_instance.h"
8 #include "base/logging.h" 8 #include "base/logging.h"
9 #include "base/time/default_tick_clock.h" 9 #include "base/time/default_tick_clock.h"
10 #include "content/public/common/content_client.h" 10 #include "content/public/common/content_client.h"
(...skipping 16 matching lines...) Expand all
27 } 27 }
28 28
29 RenderMediaClient::~RenderMediaClient() { 29 RenderMediaClient::~RenderMediaClient() {
30 } 30 }
31 31
32 void RenderMediaClient::AddKeySystemsInfoForUMA( 32 void RenderMediaClient::AddKeySystemsInfoForUMA(
33 std::vector<media::KeySystemInfoForUMA>* key_systems_info_for_uma) { 33 std::vector<media::KeySystemInfoForUMA>* key_systems_info_for_uma) {
34 DVLOG(2) << __FUNCTION__; 34 DVLOG(2) << __FUNCTION__;
35 #if defined(WIDEVINE_CDM_AVAILABLE) 35 #if defined(WIDEVINE_CDM_AVAILABLE)
36 key_systems_info_for_uma->push_back(media::KeySystemInfoForUMA( 36 key_systems_info_for_uma->push_back(media::KeySystemInfoForUMA(
37 kWidevineKeySystem, kWidevineKeySystemNameForUMA, true)); 37 kWidevineKeySystem, kWidevineKeySystemNameForUMA));
38 #endif // WIDEVINE_CDM_AVAILABLE 38 #endif // WIDEVINE_CDM_AVAILABLE
39 } 39 }
40 40
41 bool RenderMediaClient::IsKeySystemsUpdateNeeded() { 41 bool RenderMediaClient::IsKeySystemsUpdateNeeded() {
42 DVLOG(2) << __FUNCTION__; 42 DVLOG(2) << __FUNCTION__;
43 DCHECK(thread_checker_.CalledOnValidThread()); 43 DCHECK(thread_checker_.CalledOnValidThread());
44 44
45 // Always needs update if we have never updated, regardless the 45 // Always needs update if we have never updated, regardless the
46 // |last_update_time_ticks_|'s initial value. 46 // |last_update_time_ticks_|'s initial value.
47 if (!has_updated_) { 47 if (!has_updated_) {
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
99 // This functions is for testing purpose only. The declaration in the 99 // This functions is for testing purpose only. The declaration in the
100 // header file is guarded by "#if defined(UNIT_TEST)" so that it can be used 100 // header file is guarded by "#if defined(UNIT_TEST)" so that it can be used
101 // by tests but not non-test code. However, this .cc file is compiled as part of 101 // by tests but not non-test code. However, this .cc file is compiled as part of
102 // "content" where "UNIT_TEST" is not defined. So we need to specify 102 // "content" where "UNIT_TEST" is not defined. So we need to specify
103 // "CONTENT_EXPORT" here again so that it is visible to tests. 103 // "CONTENT_EXPORT" here again so that it is visible to tests.
104 CONTENT_EXPORT RenderMediaClient* GetRenderMediaClientInstanceForTesting() { 104 CONTENT_EXPORT RenderMediaClient* GetRenderMediaClientInstanceForTesting() {
105 return g_render_media_client.Pointer(); 105 return g_render_media_client.Pointer();
106 } 106 }
107 107
108 } // namespace content 108 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/media/cdm/render_cdm_factory.cc ('k') | content/renderer/render_frame_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698