CdmAdapter: Allow parallel SendPlatformChallenge() calls.

media/cdm/ppapi/cdm_adapter.h

Index: media/cdm/ppapi/cdm_adapter.h
diff --git a/media/cdm/ppapi/cdm_adapter.h b/media/cdm/ppapi/cdm_adapter.h
index cd65b181f07e224d97341c48db60294e5248bcab..bb1f24df3cfa4f0670a178e4ce970211045e693f 100644
--- a/media/cdm/ppapi/cdm_adapter.h
+++ b/media/cdm/ppapi/cdm_adapter.h
@@ -245,7 +245,15 @@ class CdmAdapter : public pp::Instance,
   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);
 
@@ -258,7 +266,6 @@ class CdmAdapter : public pp::Instance,
   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_;