PpapiDecryptor: Call NewKeyCB on OnSessionReady().

media/cdm/ppapi/external_clear_key/clear_key_cdm.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 MEDIA_CDM_PPAPI_EXTERNAL_CLEAR_KEY_CLEAR_KEY_CDM_H_
 #define MEDIA_CDM_PPAPI_EXTERNAL_CLEAR_KEY_CLEAR_KEY_CDM_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 52 matching lines @@
       cdm::AudioFrames* audio_frames) OVERRIDE;
   virtual void Destroy() OVERRIDE;
   virtual void OnPlatformChallengeResponse(
       const cdm::PlatformChallengeResponse& response) OVERRIDE;
   virtual void OnQueryOutputProtectionStatus(
       uint32_t link_mask, uint32_t output_protection_mask) OVERRIDE;
 
  private:
   // Emulates a session stored for |session_id_for_emulated_loadsession_|. This
   // is necessary since aes_decryptor.cc does not support storing sessions.
-  void UpdateLoadableSession();
+  void LoadLoadableSession();
 
   // ContentDecryptionModule callbacks.
   void OnSessionCreated(uint32 session_id, const std::string& web_session_id);
   void OnSessionMessage(uint32 session_id,
                         const std::vector<uint8>& message,
                         const std::string& destination_url);
   void OnSessionReady(uint32 session_id);
   void OnSessionClosed(uint32 session_id);
   void OnSessionError(uint32 session_id,
                       MediaKeys::KeyError error_code,
@@ skipping 42 matching lines @@
   uint32 last_session_id_;
   std::string next_heartbeat_message_;
 
   // TODO(xhwang): Extract testing code from main implementation.
   // See http://crbug.com/341751
   uint32 session_id_for_emulated_loadsession_;
 
   // Timer delay in milliseconds for the next host_->SetTimer() call.
   int64 timer_delay_ms_;
 
-  // Indicates whether a timer has been set to prevent multiple timers from
-  // running.
-  bool timer_set_;
+  // Indicates whether a heartbeat timer has been set to prevent multiple timers
+  // from running.
+  bool heartbeat_timer_set_;
 
 #if defined(CLEAR_KEY_CDM_USE_FAKE_AUDIO_DECODER)
   int channel_count_;
   int bits_per_channel_;
   int samples_per_second_;
   int64 output_timestamp_base_in_microseconds_;
   int total_samples_generated_;
 #endif  // CLEAR_KEY_CDM_USE_FAKE_AUDIO_DECODER
 
 #if defined(CLEAR_KEY_CDM_USE_FFMPEG_DECODER)
   scoped_ptr<FFmpegCdmAudioDecoder> audio_decoder_;
 #endif  // CLEAR_KEY_CDM_USE_FFMPEG_DECODER
 
   scoped_ptr<CdmVideoDecoder> video_decoder_;
 
   scoped_ptr<FileIOTestRunner> file_io_test_runner_;
 
   DISALLOW_COPY_AND_ASSIGN(ClearKeyCdm);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_CDM_PPAPI_EXTERNAL_CLEAR_KEY_CLEAR_KEY_CDM_H_