Add MediaKeys::GetCdmId().

content/renderer/media/crypto/render_cdm_factory.h

 // Copyright 2013 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.
 
 #ifndef CONTENT_RENDERER_MEDIA_CRYPTO_RENDER_CDM_FACTORY_H_
 #define CONTENT_RENDERER_MEDIA_CRYPTO_RENDER_CDM_FACTORY_H_
 
 #include <string>
 
 #include "base/memory/scoped_ptr.h"
@@ skipping 20 matching lines @@
   explicit RenderCdmFactory(RendererCdmManager* manager);
 #else
   RenderCdmFactory();
 #endif  // defined(ENABLE_PEPPER_CDMS)
 
   virtual ~RenderCdmFactory();
 
   virtual scoped_ptr<media::MediaKeys> Create(
       const std::string& key_system,
       const GURL& security_origin,
-#if defined(ENABLE_BROWSER_CDMS)
-      int* cdm_id,
-#endif
       const media::SessionMessageCB& session_message_cb,
       const media::SessionReadyCB& session_ready_cb,
       const media::SessionClosedCB& session_closed_cb,
       const media::SessionErrorCB& session_error_cb,
       const media::SessionKeysChangeCB& session_keys_change_cb,
       const media::SessionExpirationUpdateCB& session_expiration_update_cb)
       override;
 
  private:
 #if defined(ENABLE_PEPPER_CDMS)
   CreatePepperCdmCB create_pepper_cdm_cb_;
 #elif defined(ENABLE_BROWSER_CDMS)
   RendererCdmManager* manager_;
 #endif
 
   DISALLOW_COPY_AND_ASSIGN(RenderCdmFactory);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_MEDIA_CRYPTO_RENDER_CDM_FACTORY_H_