Update Pepper interface for EME

media/base/cdm_promise.h

 // Copyright 2014 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_BASE_CDM_PROMISE_H_
 #define MEDIA_BASE_CDM_PROMISE_H_
 
 #include <string>
 
 #include "base/basictypes.h"
@@ skipping 17 matching lines @@
     NOT_SUPPORTED_ERROR,
     INVALID_STATE_ERROR,
     INVALID_ACCESS_ERROR,
     QUOTA_EXCEEDED_ERROR,
     UNKNOWN_ERROR,
     CLIENT_ERROR,
     OUTPUT_ERROR,
     NUM_RESULT_CODES
   };
 
+  enum PromiseType {
+    UNKNOWN_TYPE,
+    SIMPLE_TYPE,
+    NEW_SESSION_TYPE,
+    KEY_IDS_TYPE
+  };
+
   typedef base::Callback<void(MediaKeys::Exception exception_code,
                               uint32 system_code,
                               const std::string& error_message)>
       PromiseRejectedCB;
 
   virtual ~CdmPromise();
 
   // Used to indicate that the operation failed. |exception_code| must be
   // specified. |system_code| is a Key System-specific value for the error
   // that occurred, or 0 if there is no associated status code or such status
   // codes are not supported by the Key System. |error_message| is optional.
   virtual void reject(MediaKeys::Exception exception_code,

[ddorwin, 2014/08/25 22:55:01]

Not now, but this should be _R_eject.

[jrummell, 2014/08/26 00:19:23]

Acknowledged.

                       uint32 system_code,
                       const std::string& error_message);
 
+  virtual PromiseType Type();

[ddorwin, 2014/08/25 22:55:01]

Since this is a getter, it should be type().
Also, const function.

[jrummell, 2014/08/26 00:19:23]

Done.

+
  protected:
   CdmPromise();
   CdmPromise(PromiseRejectedCB reject_cb);
 
   // If constructed with a |uma_name| (which must be the name of a
   // CdmPromiseResult UMA), CdmPromise will report the promise result (success
   // or rejection code).
   CdmPromise(PromiseRejectedCB reject_cb, const std::string& uma_name);
 
   PromiseRejectedCB reject_cb_;
 
   // Keep track of whether the promise hasn't been resolved or rejected yet.
   bool is_pending_;
 
   // UMA to report result to.
   std::string uma_name_;
 
   DISALLOW_COPY_AND_ASSIGN(CdmPromise);
 };
 
 template <typename T>
 class MEDIA_EXPORT CdmPromiseTemplate : public CdmPromise {
  public:
   CdmPromiseTemplate(base::Callback<void(const T&)> resolve_cb,
                      PromiseRejectedCB rejected_cb);
   CdmPromiseTemplate(base::Callback<void(const T&)> resolve_cb,
                      PromiseRejectedCB rejected_cb,
                      const std::string& uma_name);
   virtual ~CdmPromiseTemplate();
   virtual void resolve(const T& result);

[ddorwin, 2014/08/25 22:55:01]

Not now, but this should be _R_esolve.

[jrummell, 2014/08/26 00:19:23]

Acknowledged.

+  virtual PromiseType Type();

[ddorwin, 2014/08/25 22:55:01]

Do we need this and l60? Would it be better to initialize the value in the
constructor? (If so, we can make it non-virtual above.)
It should at least be OVERRIDE here.

[jrummell, 2014/08/26 00:19:23]

Since this is a template, I can't find any easy way to set the type() easily.
But added OVERRIDE.

 
  protected:
   // Allow subclasses to completely override the implementation.
   // TODO(jrummell): Remove when derived class SessionLoadedPromise
   // (in ppapi_decryptor.cc) is no longer needed.
   CdmPromiseTemplate();
 
  private:
   base::Callback<void(const T&)> resolve_cb_;
 
   DISALLOW_COPY_AND_ASSIGN(CdmPromiseTemplate);
 };
 
 // Specialization for no parameter to resolve().
 template <>
 class MEDIA_EXPORT CdmPromiseTemplate<void> : public CdmPromise {
  public:
   CdmPromiseTemplate(base::Callback<void(void)> resolve_cb,
                      PromiseRejectedCB rejected_cb);
   CdmPromiseTemplate(base::Callback<void(void)> resolve_cb,
                      PromiseRejectedCB rejected_cb,
                      const std::string& uma_name);
   virtual ~CdmPromiseTemplate();
   virtual void resolve();
+  virtual PromiseType Type();

[ddorwin, 2014/08/25 22:55:01]

ditto

[jrummell, 2014/08/26 00:19:23]

Acknowledged.

 
  protected:
   // Allow subclasses to completely override the implementation.
   CdmPromiseTemplate();
 
  private:
   base::Callback<void(void)> resolve_cb_;
 
   DISALLOW_COPY_AND_ASSIGN(CdmPromiseTemplate);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_BASE_CDM_PROMISE_H_