Squashed merge 3 CLs.

1. "Change CdmResponseType from enum into a struct"
Merged from http://go/wvgerrit/163199
Bug: 253271674

2. "Log request information when server returns 401"
Bug: 260760387
Bug: 186031735
Merged from http://go/wvgerrit/162798

3. "Specify server version on the command line"
Bug: 251599048
Merged from http://go/wvgerrit/158897

Test: build android.hardware.drm-service.widevine
Test: Netflix and Play Movies & TV
Test: build_and_run_all_unit_tests.sh

Bug: 253271674
Change-Id: I70c950acce070609ee0343920ec68e66b058bc23

libwvdrmengine/cdm/test/wv_cdm_metrics_test.cpp

@@ -55,11 +55,10 @@ TEST_F(WvContentDecryptionModuleMetricsTest, EngineOnlyMetrics) {
   std::string cert_authority, cert, wrapped_key;
 
   // This call will create a CdmEngine instance with an EngineMetrics instance.
-  EXPECT_EQ(wvcdm::NO_ERROR,
-            decryptor_.GetProvisioningRequest(
-                cert_type, cert_authority, kDefaultCdmIdentifier,
-                kEmptyServiceCertificate, kLevelDefault, &request,
-                &provisioning_server_url));
+  EXPECT_EQ(NO_ERROR, decryptor_.GetProvisioningRequest(
+                          cert_type, cert_authority, kDefaultCdmIdentifier,
+                          kEmptyServiceCertificate, kLevelDefault, &request,
+                          &provisioning_server_url));
 
   drm_metrics::WvCdmMetrics metrics;
   ASSERT_EQ(wvcdm::NO_ERROR,
@@ -105,7 +104,7 @@ TEST_F(WvContentDecryptionModuleMetricsTest, EngineAndSessionMetrics) {
 
   // Opening the session will fail with NEEDS_PROVISIONING error. But it will
   // still create some session-level stats.
-  EXPECT_EQ(CdmResponseType::NEED_PROVISIONING,
+  EXPECT_EQ(wvcdm::NEED_PROVISIONING,
             decryptor_.OpenSession(key_system, nullptr, kDefaultCdmIdentifier,
                                    nullptr, &session_id));
 
@@ -127,7 +126,7 @@ TEST_F(WvContentDecryptionModuleMetricsTest, EngineAndSessionMetrics) {
                   .cdm_engine_open_session(0)
                   .attributes()
                   .error_code(),
-              Eq(CdmResponseType::NEED_PROVISIONING));
+              Eq(NEED_PROVISIONING));
 
   // Validate a session-level metric.
   ASSERT_THAT(metrics.session_metrics().size(), Eq(1));
@@ -154,7 +153,7 @@ TEST_F(WvContentDecryptionModuleMetricsTest,
     // make the open session call a different number of times for
     // each identifier.
     for (int j = 0; j <= i; j++) {
-      EXPECT_EQ(CdmResponseType::NEED_PROVISIONING,
+      EXPECT_EQ(NEED_PROVISIONING,
                 decryptor_.OpenSession(key_system, nullptr, identifiers[i],
                                        nullptr, &session_id));
     }
@@ -177,7 +176,7 @@ TEST_F(WvContentDecryptionModuleMetricsTest,
                     .cdm_engine_open_session(0)
                     .attributes()
                     .error_code(),
-                Eq(CdmResponseType::NEED_PROVISIONING));
+                Eq(NEED_PROVISIONING));
 
     // Spot check a session-level metric.
     ASSERT_THAT(metrics.session_metrics().size(), Eq(i + 1))