Update Pepper interface for EME

media/cdm/ppapi/cdm_wrapper.h

Index: media/cdm/ppapi/cdm_wrapper.h
diff --git a/media/cdm/ppapi/cdm_wrapper.h b/media/cdm/ppapi/cdm_wrapper.h
index 72afa90a029b2b06f972b71115d16d1f89f57d3f..aeeb51963e41407560a042c256e2bb8ddcd0a1d5 100644
--- a/media/cdm/ppapi/cdm_wrapper.h
+++ b/media/cdm/ppapi/cdm_wrapper.h
@@ -42,6 +42,9 @@ class CdmWrapper {
 
   virtual ~CdmWrapper() {};
 
+  virtual bool SetServerCertificate(uint32_t promise_id,

[ddorwin, 2014/08/22 20:49:20]

Is there a reason this has a return value?
Should it be removed when CDM_4/5 are no longer supported?
I may have asked this before, but can we just reject the promise here instead?
(I think the answer is that we don't have a host pointer, so no.)

Ditto on some of the other existing methods.

[jrummell, 2014/08/25 21:54:36]

You are correct. Added comment to match other methods (which were updated in a
CL over the weekend).

+                                    const uint8_t* server_certificate_data,
+                                    uint32_t server_certificate_data_size) = 0;
   virtual void CreateSession(uint32_t promise_id,
                              const char* init_data_type,
                              uint32_t init_data_type_size,
@@ -173,6 +176,15 @@ class CdmWrapperImpl : public CdmWrapper {
            std::equal(data, data + header.length(), header.begin());
   }
 
+  virtual bool SetServerCertificate(
+      uint32_t promise_id,
+      const uint8_t* server_certificate_data,
+      uint32_t server_certificate_data_size) OVERRIDE {
+    cdm_->SetServerCertificate(
+        promise_id, server_certificate_data, server_certificate_data_size);
+    return true;
+  }
+
   virtual void CreateSession(uint32_t promise_id,
                              const char* init_data_type,
                              uint32_t init_data_type_size,
@@ -404,6 +416,14 @@ class CdmWrapperImpl : public CdmWrapper {
 // TODO(jrummell): Remove these once Host_4 interface is removed.
 
 template <>
+bool CdmWrapperImpl<cdm::ContentDecryptionModule_4>::SetServerCertificate(
+    uint32_t promise_id,
+    const uint8_t* server_certificate_data,
+    uint32_t server_certificate_data_size) {
+  return false;
+}
+
+template <>
 void CdmWrapperImpl<cdm::ContentDecryptionModule_4>::CreateSession(
     uint32_t promise_id,
     const char* init_data_type,
@@ -513,6 +533,14 @@ CdmWrapperImpl<cdm::ContentDecryptionModule_4>::DecryptAndDecodeSamples(
 // TODO(jrummell): Remove these once Host_5 interface is removed.
 
 template <>
+bool CdmWrapperImpl<cdm::ContentDecryptionModule_5>::SetServerCertificate(
+    uint32_t promise_id,
+    const uint8_t* server_certificate_data,
+    uint32_t server_certificate_data_size) {
+  return false;
+}
+
+template <>
 void CdmWrapperImpl<cdm::ContentDecryptionModule_5>::CreateSession(
     uint32_t promise_id,
     const char* init_data_type,