Update ClearKey to support CDM_6

media/base/cdm_promise.h

Index: media/base/cdm_promise.h
diff --git a/media/base/cdm_promise.h b/media/base/cdm_promise.h
index ad1d196ad6e003f2fcb86be2c8ec6ae07e51db35..1c9422fed3be5ada0221b7dd05ea9b7e66d020b1 100644
--- a/media/base/cdm_promise.h
+++ b/media/base/cdm_promise.h
@@ -57,6 +57,10 @@ class MEDIA_EXPORT CdmPromiseTemplate : public CdmPromise {
   virtual ~CdmPromiseTemplate();
   virtual void resolve(const T& result);
 
+ protected:
+  // Allow subclasses to completely override the implementation.
+  CdmPromiseTemplate();

[ddorwin, 2014/08/08 23:36:23]

Where is this being used?

[jrummell, 2014/08/11 18:59:03]

class SessionLoadedPromise in ppapi_decryptor.cc. When SessionLoadedPromise (and
SessionUpdatedPromise) go away, these protected methods won't be needed anymore.

+
  private:
   base::Callback<void(const T&)> resolve_cb_;