CdmAdapter: Add UMA for output protection queries and results.

media/cdm/ppapi/cdm_adapter.h

Index: media/cdm/ppapi/cdm_adapter.h
diff --git a/media/cdm/ppapi/cdm_adapter.h b/media/cdm/ppapi/cdm_adapter.h
index 1a05ada7801e028341312f64eb4fed119c4aac96..89876dade02c712e3a1cee2027adb86ae384c1a6 100644
--- a/media/cdm/ppapi/cdm_adapter.h
+++ b/media/cdm/ppapi/cdm_adapter.h
@@ -106,6 +106,15 @@ class CdmAdapter : public pp::Instance,
   virtual cdm::FileIO* CreateFileIO(cdm::FileIOClient* client) OVERRIDE;
 
  private:
+  // These are reported to UMA server. Do not change the existing values!
+  enum OutputProtectionStatus {
+    OUTPUT_PROTECTION_QUERIED = 0,

[ddorwin, 2014/04/30 23:13:35]

It seems odd to have the "total" value in the same UMA. Shouldn't it be a
separate count?

[xhwang, 2014/04/30 23:48:16]

Agreed. But that makes it harder to dig out data. Also, UMA_Private doesn't
provide a way to send counts yet :(

https://code.google.com/p/chromium/codesearch#chromium/src/ppapi/cpp/private/...

+    OUTPUT_PROTECTION_QUERY_ERROR = 1,

[ddorwin, 2014/04/30 23:13:35]

This is not "positive". Should we just consider this negative and ignore it?

[xhwang, 2014/04/30 23:48:16]

Done.

+    OUTPUT_PROTECTION_NO_EXTERNAL_LINK = 2,
+    OUTPUT_PROTECTION_ALL_EXTERNAL_LINKS_PROTECTED = 3,
+    OUTPUT_PROTECTION_MAX = 4
+  };
+
   typedef linked_ptr<DecryptedBlockImpl> LinkedDecryptedBlock;
   typedef linked_ptr<VideoFrameImpl> LinkedVideoFrame;
   typedef linked_ptr<AudioFramesImpl> LinkedAudioFrames;
@@ -165,6 +174,9 @@ class CdmAdapter : public pp::Instance,
 #endif  // !defined(NDEBUG)
 
 #if defined(OS_CHROMEOS)
+  void ReportOutputProtectionStatus(OutputProtectionStatus status);
+  void ReportOutputProtectionQueryResult(int32_t result);
+
   void SendPlatformChallengeDone(int32_t result);
   void EnableProtectionDone(int32_t result);
   void QueryOutputProtectionStatusDone(int32_t result);
@@ -184,6 +196,13 @@ class CdmAdapter : public pp::Instance,
   uint32_t output_link_mask_;
   uint32_t output_protection_mask_;
   bool query_output_protection_in_progress_;
+
+  // We report the following stats to UMA:
+  // - Whether output protection has been queried.
+  // - Whether a positive result (no unprotected external link) is returned.

[ddorwin, 2014/04/30 23:13:35]

What about QUERY_ERROR? That's not positive.

"Whether" seems wrong. We report queries and positive results (+ query errors)

[xhwang, 2014/04/30 23:48:16]

Done.

+  // The following two variables help track the status of the UMA reporting.
+  bool uma_for_output_protection_query_reported_;
+  bool uma_for_output_protection_positive_result_reported_;
 #endif
 
   PpbBufferAllocator allocator_;