Cleanup template in CdmPromise

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 33ec042510c841baa7d6715dff94440d57032642..364b0602de980619afb90bf62a33c92ff5f9b756 100644
--- a/media/base/cdm_promise.h
+++ b/media/base/cdm_promise.h
@@ -67,6 +67,10 @@ class MEDIA_EXPORT CdmPromise {
   // or rejection code).
   CdmPromise(PromiseRejectedCB reject_cb, const std::string& uma_name);
 
+  // Called by all resolve() methods to do the check on |is_pending_|

[ddorwin, 2014/09/19 20:56:46]

... to report UMA, if applicable, and update |is_pending_|.

^ Start with the important thing (and the reason for its name); the check is a
DCHECK, so focus on the unconditional behavior.

[jrummell, 2014/09/22 19:21:10]

Done.

+  // and call the UMA success if required.
+  void ReportResolution();

[ddorwin, 2014/09/19 20:56:46]

nit: "Resolution" has many meanings. How about ReportResolved?

[xhwang, 2014/09/20 00:34:50]

ReportXxxToUMA() to be explicit?

[jrummell, 2014/09/22 19:21:10]

Done.

[jrummell, 2014/09/22 19:21:10]

Done.

+
   PromiseRejectedCB reject_cb_;
 
   // Keep track of whether the promise hasn't been resolved or rejected yet.
@@ -78,17 +82,16 @@ class MEDIA_EXPORT CdmPromise {
   DISALLOW_COPY_AND_ASSIGN(CdmPromise);
 };
 
-// Specialization for no parameter to resolve().
-template <>
-class MEDIA_EXPORT CdmPromiseTemplate<void> : public CdmPromise {
+template <typename T>
+class MEDIA_EXPORT CdmPromiseTemplate : public CdmPromise {
  public:
-  CdmPromiseTemplate(base::Callback<void(void)> resolve_cb,
+  CdmPromiseTemplate(base::Callback<void(const T&)> resolve_cb,
                      PromiseRejectedCB rejected_cb);
-  CdmPromiseTemplate(base::Callback<void(void)> resolve_cb,
+  CdmPromiseTemplate(base::Callback<void(const T&)> resolve_cb,
                      PromiseRejectedCB rejected_cb,
                      const std::string& uma_name);
   virtual ~CdmPromiseTemplate();
-  virtual void resolve();
+  virtual void resolve(const T& result);
   virtual ResolveParameterType GetResolveParameterType() const OVERRIDE;

[ddorwin, 2014/09/19 20:56:46]

Rather than overriding this, can we make the base class non-virtual and have its
constructor take the type? We can use the same traits call as in the override in
this class's constructor.

[jrummell, 2014/09/22 19:21:10]

Done.

 
  protected:
@@ -96,49 +99,30 @@ class MEDIA_EXPORT CdmPromiseTemplate<void> : public CdmPromise {
   CdmPromiseTemplate();
 
  private:
-  base::Callback<void(void)> resolve_cb_;
+  base::Callback<void(const T&)> resolve_cb_;
 
   DISALLOW_COPY_AND_ASSIGN(CdmPromiseTemplate);
 };
 
+// Specialization for no parameter to resolve().
 template <>
-class MEDIA_EXPORT CdmPromiseTemplate<std::string> : public CdmPromise {
+class MEDIA_EXPORT CdmPromiseTemplate<void> : public CdmPromise {
  public:
-  CdmPromiseTemplate(base::Callback<void(const std::string&)> resolve_cb,
+  CdmPromiseTemplate(base::Callback<void(void)> resolve_cb,
                      PromiseRejectedCB rejected_cb);
-  CdmPromiseTemplate(base::Callback<void(const std::string&)> resolve_cb,
+  CdmPromiseTemplate(base::Callback<void(void)> resolve_cb,
                      PromiseRejectedCB rejected_cb,
                      const std::string& uma_name);
   virtual ~CdmPromiseTemplate();
-  virtual void resolve(const std::string& result);
+  virtual void resolve();
   virtual ResolveParameterType GetResolveParameterType() const 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 std::string&)> resolve_cb_;
-
-  DISALLOW_COPY_AND_ASSIGN(CdmPromiseTemplate);
-};
-
-template <>
-class MEDIA_EXPORT CdmPromiseTemplate<KeyIdsVector> : public CdmPromise {
- public:
-  CdmPromiseTemplate(base::Callback<void(const KeyIdsVector&)> resolve_cb,
-                     PromiseRejectedCB rejected_cb);
-  CdmPromiseTemplate(base::Callback<void(const KeyIdsVector&)> resolve_cb,
-                     PromiseRejectedCB rejected_cb,
-                     const std::string& uma_name);
-  virtual ~CdmPromiseTemplate();
-  virtual void resolve(const KeyIdsVector& result);
-  virtual ResolveParameterType GetResolveParameterType() const OVERRIDE;
-
- private:
-  base::Callback<void(const KeyIdsVector&)> resolve_cb_;
+  base::Callback<void(void)> resolve_cb_;
 
   DISALLOW_COPY_AND_ASSIGN(CdmPromiseTemplate);
 };