Merge changes I2618c2be,Ie8b9d8b9,I2f39f99c

* changes:
  Support GetPropertyByteArray for getting metrics.
  CDM Metrics Protocol buffer serialization.
  Refactored metrics to support pull model.

libwvdrmengine/cdm/include/ami_adapter.h

@@ -4,22 +4,19 @@
 #define CDM_AMI_ADAPTER_H_
 
 #include <stdint.h>
+#include <string>
 
 #include <media/MediaAnalyticsItem.h>
 
-#include "report.h"
-
 namespace wvcdm {
 
-class AmiAdapter : public metrics::Report {
+class AmiAdapter {
 
  public:
   AmiAdapter();
   AmiAdapter(int64_t parent);
   ~AmiAdapter();
 
-  metrics::Report* NewReport() const;
-
   void UpdateString(const std::string& metric_id, const std::string& value);
   void UpdateInt32(const std::string& metric_id, int32_t value);
   void UpdateInt64(const std::string& metric_id, int64_t value);

libwvdrmengine/cdm/include/wv_content_decryption_module.h

@@ -11,7 +11,6 @@
 #include "cdm_identifier.h"
 #include "file_store.h"
 #include "lock.h"
-#include "metrics_front_end.h"
 #include "timer.h"
 #include "wv_cdm_types.h"
 
@@ -126,6 +125,9 @@ class WvContentDecryptionModule : public android::RefBase, public TimerHandler {
   // Validate a passed-in service certificate
   virtual bool IsValidServiceCertificate(const std::string& certificate);
 
+  // Retrieve the serialized metrics from the CDM.
+  virtual void GetSerializedMetrics(std::string* serialized_metrics);
+
  private:
   struct CdmInfo {
     CdmInfo();
@@ -160,9 +162,6 @@ class WvContentDecryptionModule : public android::RefBase, public TimerHandler {
   // This contains weak pointers to the CDM instances contained in |cdms_|.
   std::map<std::string, CdmEngine*> cdm_by_session_id_;
 
-  metrics::Report* report_root_;
-  metrics::MetricsFrontEnd* front_end_;
-
   CORE_DISALLOW_COPY_AND_ASSIGN(WvContentDecryptionModule);
 };