Add MediaKeys::GetCdmId().

content/renderer/media/crypto/proxy_media_keys.h

 // 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.
 
 #ifndef CONTENT_RENDERER_MEDIA_CRYPTO_PROXY_MEDIA_KEYS_H_
 #define CONTENT_RENDERER_MEDIA_CRYPTO_PROXY_MEDIA_KEYS_H_
 
 #include <map>
 #include <string>
 
@@ skipping 46 matching lines @@
       scoped_ptr<media::SimpleCdmPromise> promise) override;
   virtual void CloseSession(
       const std::string& web_session_id,
       scoped_ptr<media::SimpleCdmPromise> promise) override;
   virtual void RemoveSession(
       const std::string& web_session_id,
       scoped_ptr<media::SimpleCdmPromise> promise) override;
   virtual void GetUsableKeyIds(
       const std::string& web_session_id,
       scoped_ptr<media::KeyIdsPromise> promise) override;
+  virtual int GetCdmId() const override;
 
   // Callbacks.
   void OnSessionCreated(uint32 session_id, const std::string& web_session_id);
   void OnSessionMessage(uint32 session_id,
                         const std::vector<uint8>& message,
                         const GURL& destination_url);
   void OnSessionReady(uint32 session_id);
   void OnSessionClosed(uint32 session_id);
   void OnSessionError(uint32 session_id,
                       media::MediaKeys::KeyError error_code,
                       uint32 system_code);
 
-  int GetCdmId() const;
-
  private:
   // The Android-specific code that handles sessions uses integer session ids
   // (basically a reference id), but media::MediaKeys bases everything on
   // web_session_id (a string representing the actual session id as generated
   // by the CDM). SessionIdMap is used to map between the web_session_id and
   // the session_id used by the Android-specific code.
   typedef base::hash_map<std::string, uint32_t> SessionIdMap;
 
   // The following types keep track of Promises. The index is the
   // Android-specific session_id, so that returning results can be matched to
@@ skipping 39 matching lines @@
 
   // Keep track of outstanding promises. This map owns the promise object.
   PromiseMap session_id_to_promise_map_;
 
   DISALLOW_COPY_AND_ASSIGN(ProxyMediaKeys);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_MEDIA_CRYPTO_PROXY_MEDIA_KEYS_H_