Merge "Ref count Timer implementation" into qt-dev am: ed833222a6

am: 389d917e88

Change-Id: Ie51744931c38b5e4b0bc8110b07fee9d229870f9

libwvdrmengine/cdm/include/timer.h

@@ -9,6 +9,8 @@
 
 #include <stdint.h>
 
+#include "utils/StrongPointer.h"
+
 #include "disallow_copy_and_assign.h"
 
 namespace wvcdm {
@@ -45,7 +47,7 @@ class Timer {
   bool IsRunning();
 
  private:
-  Impl *impl_;
+  android::sp<Impl> impl_;
 
   CORE_DISALLOW_COPY_AND_ASSIGN(Timer);
 };

libwvdrmengine/cdm/src/timer.cpp

@@ -81,9 +81,6 @@ Timer::Timer() : impl_(new Timer::Impl()) {
 Timer::~Timer() {
   if (IsRunning())
     Stop();
-
-  delete impl_;
-  impl_ = NULL;
 }
 
 bool Timer::Start(TimerHandler *handler, uint32_t time_in_secs) {