Multiple Renewal Keys and Logging

In this code update we add a test to ensure that the White-box API
implementation handle seeing multiple renewal keys correctly. Since
there should be no more than one renewal key in a license response, upon
seeing a second renewal key, the implementation should return a
WB_RESULT_INVALID_PARAMETER code.

Due to changes in how Chrome manages CHECKS and DCHECKS, this code has
been updated to use the new headers.

api/aead_whitebox_benchmark.cc

@@ -7,7 +7,6 @@
 
 #include "api/aead_whitebox.h"
 #include "api/test_data.h"
-#include "base/logging.h"
 #include "benchmarking/data_source.h"
 #include "benchmarking/measurements.h"
 #include "testing/gtest/include/gtest/gtest.h"

api/license_whitebox_decrypt_benchmark.cc

@@ -11,7 +11,6 @@
 #include "api/result.h"
 #include "api/test_data.h"
 #include "api/test_license_builder.h"
-#include "base/logging.h"
 #include "benchmarking/data_source.h"
 #include "benchmarking/measurements.h"
 #include "testing/gtest/include/gtest/gtest.h"

api/license_whitebox_masked_decrypt_test.cc

@@ -11,7 +11,6 @@
 #include "api/license_whitebox_test_base.h"
 #include "api/test_data.h"
 #include "api/test_license_builder.h"
-#include "base/logging.h"
 #include "crypto_utils/crypto_util.h"
 #include "crypto_utils/rsa_key.h"
 #include "testing/gtest/include/gtest/gtest.h"

api/license_whitebox_process_license_response_benchmark.cc

@@ -8,7 +8,6 @@
 #include "api/result.h"
 #include "api/test_data.h"
 #include "api/test_license_builder.h"
-#include "base/logging.h"
 #include "benchmarking/measurements.h"
 #include "testing/gtest/include/gtest/gtest.h"
 

api/license_whitebox_process_license_response_test.cc

@@ -74,6 +74,26 @@ TEST_F(LicenseWhiteboxProcessLicenseResponseTest,
       WB_RESULT_OK);
 }
 
+TEST_F(LicenseWhiteboxProcessLicenseResponseTest,
+       InvalidParameterWithMultipleSigningKeys) {
+  TestLicenseBuilder builder;
+  builder.AddSigningKey(TestLicenseBuilder::DefaultSigningKey(),
+                        TestLicenseBuilder::PKSC8Padding());
+  builder.AddSigningKey(TestLicenseBuilder::DefaultSigningKey(),
+                        TestLicenseBuilder::PKSC8Padding());
+  builder.AddStubbedContentKey();
+  builder.Build(*public_key_, &license_);
+
+  ASSERT_EQ(
+      WB_License_ProcessLicenseResponse(
+          whitebox_, license_.core_message.data(), license_.core_message.size(),
+          license_.message.data(), license_.message.size(),
+          license_.signature.data(), license_.signature.size(),
+          license_.session_key.data(), license_.session_key.size(),
+          license_.request.data(), license_.request.size()),
+      WB_RESULT_INVALID_PARAMETER);
+}
+
 class LicenseWhiteboxProcessLicenseResponseErrorTest
     : public LicenseWhiteboxProcessLicenseResponseTest {
  protected:

api/license_whitebox_sign_benchmark.cc

@@ -11,7 +11,6 @@
 #include "api/result.h"
 #include "api/test_data.h"
 #include "api/test_license_builder.h"
-#include "base/logging.h"
 #include "benchmarking/data_source.h"
 #include "benchmarking/measurements.h"
 #include "testing/gtest/include/gtest/gtest.h"

api/license_whitebox_verify_benchmark.cc

@@ -11,7 +11,6 @@
 #include "api/result.h"
 #include "api/test_data.h"
 #include "api/test_license_builder.h"
-#include "base/logging.h"
 #include "benchmarking/data_source.h"
 #include "benchmarking/measurements.h"
 #include "testing/gtest/include/gtest/gtest.h"

api/test_license_builder.cc

@@ -4,7 +4,8 @@
 
 #include <ctime>
 
-#include "base/logging.h"
+#include "base/check.h"
+#include "base/check_op.h"
 #include "cdm/keys/certs.h"
 #include "crypto_utils/aes_cbc_encryptor.h"
 #include "crypto_utils/crypto_util.h"