Don't pass domain and verification key to validation when not required

components/policy/core/common/cloud/cloud_policy_validator_unittest.cc

Index: components/policy/core/common/cloud/cloud_policy_validator_unittest.cc
diff --git a/components/policy/core/common/cloud/cloud_policy_validator_unittest.cc b/components/policy/core/common/cloud/cloud_policy_validator_unittest.cc
index e0a7f980d3c6f9792e7ad7e3cc14bacc308761fc..15181349dda38780924b935c8a5e0ef4e5482754 100644
--- a/components/policy/core/common/cloud/cloud_policy_validator_unittest.cc
+++ b/components/policy/core/common/cloud/cloud_policy_validator_unittest.cc
@@ -107,10 +107,12 @@ class CloudPolicyValidatorTest : public testing::Test {
                                  cached_key_signature_,
                                  GetPolicyVerificationKey(),
                                  owning_domain_);
-    validator->ValidateSignature(public_key,
-                                 GetPolicyVerificationKey(),
-                                 owning_domain_,
-                                 allow_key_rotation_);
+    if (allow_key_rotation_) {
+      validator->ValidateSignatureAllowingRotation(
+          public_key, GetPolicyVerificationKey(), owning_domain_);
+    } else {
+      validator->ValidateSignature(public_key);
+    }
     if (allow_key_rotation_)
       validator->ValidateInitialKey(GetPolicyVerificationKey(), owning_domain_);

[Mattias Nissler (ping if slow), 2016/11/14 08:46:46]

nit: it seems worthwhile to fold this line into the conditional you added?

[emaxx, 2016/11/14 16:27:07]

Good point, done.

Actually, after the refactoring done in this CL it becomes obvious that calling
both methods (ValidateSignatureAllowingRotation and ValidateInitialKey as they
are named now) is a bit strange here, as they instruct the validator to check
the same new_public_key field, with the only difference is that the former
allows the new_public_key to be empty, while the latter requires it to be
non-empty.

So it would be probably better if there were _three_ groups of tests: 1) without
key rotation checking, 2) with optional key rotation checking, 3) with initial
key checking.

But I think that leaving the tests as is should be also fine, as at least they
cover all code paths in the validator. (As long as there are no complaints from
the reviewers.)

     return base::WrapUnique(validator);