Add MediaKeys::GetCdmId().

content/renderer/media/crypto/renderer_cdm_manager.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/renderer/media/crypto/renderer_cdm_manager.h"
 
 #include "base/stl_util.h"
 #include "content/common/media/cdm_messages.h"
 #include "content/renderer/media/crypto/proxy_media_keys.h"
 
 namespace content {
 
 // Maximum sizes for various EME API parameters. These are checks to prevent
 // unnecessarily large messages from being passed around, and the sizes
 // are somewhat arbitrary as the EME spec doesn't specify any limits.
 const size_t kMaxWebSessionIdLength = 512;
 const size_t kMaxSessionMessageLength = 10240;  // 10 KB
 
 RendererCdmManager::RendererCdmManager(RenderFrame* render_frame)
     : RenderFrameObserver(render_frame),
-      next_cdm_id_(kInvalidCdmId + 1) {
+      next_cdm_id_(media::MediaKeys::kInvalidCdmId + 1) {
 }
 
 RendererCdmManager::~RendererCdmManager() {
   DCHECK(proxy_media_keys_map_.empty())
       << "RendererCdmManager is owned by RenderFrameImpl and is destroyed only "
          "after all ProxyMediaKeys are destroyed and unregistered.";
 }
 
 bool RendererCdmManager::OnMessageReceived(const IPC::Message& msg) {
   bool handled = true;
@@ skipping 88 matching lines @@
                                         uint32 session_id,
                                         media::MediaKeys::KeyError error_code,
                                         uint32 system_code) {
   ProxyMediaKeys* media_keys = GetMediaKeys(cdm_id);
   if (media_keys)
     media_keys->OnSessionError(session_id, error_code, system_code);
 }
 
 int RendererCdmManager::RegisterMediaKeys(ProxyMediaKeys* media_keys) {
   int cdm_id = next_cdm_id_++;
-  DCHECK_NE(cdm_id, kInvalidCdmId);
+  DCHECK_NE(cdm_id, media::MediaKeys::kInvalidCdmId);
   DCHECK(!ContainsKey(proxy_media_keys_map_, cdm_id));
   proxy_media_keys_map_[cdm_id] = media_keys;
   return cdm_id;
 }
 
 void RendererCdmManager::UnregisterMediaKeys(int cdm_id) {
   DCHECK(ContainsKey(proxy_media_keys_map_, cdm_id));
   proxy_media_keys_map_.erase(cdm_id);
 }
 
 ProxyMediaKeys* RendererCdmManager::GetMediaKeys(int cdm_id) {
   std::map<int, ProxyMediaKeys*>::iterator iter =
       proxy_media_keys_map_.find(cdm_id);
   return (iter != proxy_media_keys_map_.end()) ? iter->second : NULL;
 }
 
 }  // namespace content