CdmAdapter: Allow parallel SendPlatformChallenge() calls.

media/cdm/ppapi/cdm_adapter.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_CDM_ADAPTER_H_
 #define MEDIA_CDM_PPAPI_CDM_ADAPTER_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 227 matching lines @@
   // CDM adapter instance. The name of the CDM adapter issuing the log message
   // will be automatically prepended to the message.
   void LogToConsole(const pp::Var& value);
 #endif  // !defined(NDEBUG)
 
 #if defined(OS_CHROMEOS)
   void ReportOutputProtectionUMA(OutputProtectionStatus status);
   void ReportOutputProtectionQuery();
   void ReportOutputProtectionQueryResult();
 
-  void SendPlatformChallengeDone(int32_t result);
+  struct PepperPlatformChallengeResponse {
+    pp::Var signed_data;
+    pp::Var signed_data_signature;
+    pp::Var platform_key_certificate;
+  };
+
+  void SendPlatformChallengeDone(
+      int32_t result,
+      const linked_ptr<PepperPlatformChallengeResponse>& response);
   void EnableProtectionDone(int32_t result);
   void QueryOutputProtectionStatusDone(int32_t result);
 
   pp::OutputProtection_Private output_protection_;
   pp::PlatformVerification platform_verification_;
 
   // Since PPAPI doesn't provide handlers for CompletionCallbacks with more than
   // one output we need to manage our own.  These values are only read by
   // SendPlatformChallengeDone().
   pp::Var signed_data_output_;
   pp::Var signed_data_signature_output_;
   pp::Var platform_key_certificate_output_;

[dmichael (off chromium), 2014/07/16 15:21:33]

Can you remove these now?

[xhwang, 2014/07/16 16:14:31]

oops, I thought I did. Done now.

-  bool challenge_in_progress_;
 
   // Same as above, these are only read by QueryOutputProtectionStatusDone().
   uint32_t output_link_mask_;
   uint32_t output_protection_mask_;
   bool query_output_protection_in_progress_;
 
   // Tracks whether an output protection query and a positive query result (no
   // unprotected external link) have been reported to UMA.
   bool uma_for_output_protection_query_reported_;
   bool uma_for_output_protection_positive_result_reported_;
@@ skipping 11 matching lines @@
   uint32_t deferred_audio_decoder_config_id_;
   bool deferred_initialize_video_decoder_;
   uint32_t deferred_video_decoder_config_id_;
 
   DISALLOW_COPY_AND_ASSIGN(CdmAdapter);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_CDM_PPAPI_CDM_ADAPTER_H_