Merge "Fix support for app package name." into oc-mr1-dev

libwvdrmengine/cdm/test/request_license_test.cpp

@@ -51,6 +51,7 @@ const int kHttpInternalServerError = 500;
 
 const wvcdm::CdmIdentifier kExampleIdentifier = {
     wvcdm::EMPTY_SPOID,
+    "com.example",
     "com.example"
 };
 

libwvdrmengine/cdm/test/wv_cdm_metrics_test.cpp

@@ -106,7 +106,7 @@ TEST_F(WvContentDecryptionModuleMetricsTest, EngineAndSessionMetrics) {
 TEST_F(WvContentDecryptionModuleMetricsTest, MultipleEngineMetric) {
   CdmSessionId session_id;
   wvcdm::CdmKeySystem key_system("com.widevine");
-  CdmIdentifier identifier = { "foo", "bar" };
+  CdmIdentifier identifier = { "foo", "bar", "baz" };
 
   // Openning the session will fail with NEEDS_PROVISIONING error. But it will
   // still create some session-level stats.
@@ -146,6 +146,9 @@ TEST_F(WvContentDecryptionModuleMetricsTest, MultipleEngineMetric) {
         metrics.metric_sub_group(i).metric_sub_group(0).metric(0).name(),
         StrEq("/drm/widevine/cdm_session/session_id"));
   }
+
+  // Verify that the second metrics app package name is set.
+  EXPECT_THAT(metrics.metric_sub_group(1).app_package_name(), StrEq("baz"));
 }
 
 }