Address compilation warnings

[ Merge of http://go/wvgerrit/90350 ]

Bug: 145244554
Test: wv android unit/integration tests
Change-Id: I5cd8a132836ce097a7b539fffdcef574f64cbdcf

libwvdrmengine/cdm/core/test/test_base.cpp

@@ -260,7 +260,7 @@ void WvCdmTestBase::InstallTestRootOfTrust() {
   }
 }
 
-void WvCdmTestBase::Provision(size_t max_attempts) {
+void WvCdmTestBase::Provision() {
   CdmProvisioningRequest prov_request;
   CdmProvisioningRequest binary_prov_request;
   std::string provisioning_server_url;
@@ -271,8 +271,6 @@ void WvCdmTestBase::Provision(size_t max_attempts) {
   CdmSessionId session_id;
   FileSystem file_system;
 
-  ASSERT_GE(max_attempts, 1lu) << "|max_attempts| must be at least 1";
-
   // TODO(fredgc): provision for different SPOIDs.
   CdmEngine cdm_engine(&file_system,
                        std::shared_ptr<EngineMetrics>(new EngineMetrics));
@@ -294,8 +292,6 @@ void WvCdmTestBase::Provision(size_t max_attempts) {
   // for test vs. production server.
   provisioning_server_url.assign(config_.provisioning_server());
 
-  // Attempt to provision using the same requests a maximum of |max_attempts|
-  // times.
   // TODO(b/139361531): Remove loop once provisioning service is stable.
   std::string http_message;
   size_t attempt_num = 0;
@@ -363,7 +359,8 @@ void WvCdmTestBase::Provision(size_t max_attempts) {
       }
     }
     provision_success = true;
-  } while (attempt_num <= max_attempts && !provision_success);
+  } while (attempt_num <= kDefaultMaxProvisioningAttempts &&
+           !provision_success);
 
   if (attempt_num > 1) {
     LOGW("Provisioning request failed at least once: attempts = %zu",

libwvdrmengine/cdm/core/test/test_base.h

@@ -35,7 +35,7 @@ class WvCdmTestBase : public ::testing::Test {
   static void InstallTestRootOfTrust();
 
   // Send provisioning request to the server and handle response.
-  virtual void Provision(size_t max_attempts = kDefaultMaxProvisioningAttempts);
+  virtual void Provision();
   // Calls Provision() if not already provisioned.
   virtual void EnsureProvisioned();