Add MediaKeys::GetCdmId().

content/renderer/media/crypto/proxy_media_keys.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/proxy_media_keys.h"
 
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/logging.h"
@@ skipping 124 matching lines @@
     const std::string& web_session_id,
     scoped_ptr<media::SimpleCdmPromise> promise) {
   promise->reject(NOT_SUPPORTED_ERROR, 0, "Not yet implemented.");
 }
 
 void ProxyMediaKeys::GetUsableKeyIds(const std::string& web_session_id,
                                      scoped_ptr<media::KeyIdsPromise> promise) {
   promise->reject(NOT_SUPPORTED_ERROR, 0, "Not yet implemented.");
 }
 
+int ProxyMediaKeys::GetCdmId() const {
+  return cdm_id_;
+}
+
 void ProxyMediaKeys::OnSessionCreated(uint32 session_id,
                                       const std::string& web_session_id) {
   AssignWebSessionId(session_id, web_session_id);
   scoped_ptr<media::CdmPromise> promise = TakePromise(session_id);
   if (promise) {
     media::NewSessionCdmPromise* session_promise(
         static_cast<media::NewSessionCdmPromise*>(promise.get()));
     session_promise->resolve(web_session_id);
   }
 }
@@ skipping 56 matching lines @@
     promise->reject(exception_code, system_code, std::string());
     return;
   }
 
   // Errors generally happen in response to a request, but it is possible
   // for something bad to happen in the CDM and it needs to tell the client.
   session_error_cb_.Run(
       web_session_id, exception_code, system_code, std::string());
 }
 
-int ProxyMediaKeys::GetCdmId() const {
-  return cdm_id_;
-}
-
 ProxyMediaKeys::ProxyMediaKeys(
     RendererCdmManager* manager,
     const media::SessionMessageCB& session_message_cb,
     const media::SessionReadyCB& session_ready_cb,
     const media::SessionClosedCB& session_closed_cb,
     const media::SessionErrorCB& session_error_cb)
     : manager_(manager),
       session_message_cb_(session_message_cb),
       session_ready_cb_(session_ready_cb),
       session_closed_cb_(session_closed_cb),
@@ skipping 51 matching lines @@
 
 scoped_ptr<media::CdmPromise> ProxyMediaKeys::TakePromise(uint32_t session_id) {
   PromiseMap::iterator it = session_id_to_promise_map_.find(session_id);
   // May not be a promise associated with this session for asynchronous events.
   if (it == session_id_to_promise_map_.end())
     return scoped_ptr<media::CdmPromise>();
   return session_id_to_promise_map_.take_and_erase(it);
 }
 
 }  // namespace content