Collect UMA data for Origin Trials

content/common/origin_trials/trial_token_validator_unittest.cc

Index: content/common/origin_trials/trial_token_validator_unittest.cc
diff --git a/content/common/origin_trials/trial_token_validator_unittest.cc b/content/common/origin_trials/trial_token_validator_unittest.cc
index 59011e785f2e87c0f7963619cdbf23986721993c..bd1ab96aace25bb8fba2132eca0e87d3225463df 100644
--- a/content/common/origin_trials/trial_token_validator_unittest.cc
+++ b/content/common/origin_trials/trial_token_validator_unittest.cc
@@ -120,41 +120,51 @@ class TrialTokenValidatorTest : public testing::Test {
 };
 
 TEST_F(TrialTokenValidatorTest, ValidateValidToken) {
-  EXPECT_TRUE(TrialTokenValidator::ValidateToken(
-      kSampleToken, appropriate_origin_, kAppropriateFeatureName));
+  EXPECT_EQ(TRIAL_TOKEN_STATUS_SUCCESS,
+            TrialTokenValidator::ValidateToken(
+                kSampleToken, appropriate_origin_, kAppropriateFeatureName));
 }
 
 TEST_F(TrialTokenValidatorTest, ValidateInappropriateOrigin) {
-  EXPECT_FALSE(TrialTokenValidator::ValidateToken(
-      kSampleToken, inappropriate_origin_, kAppropriateFeatureName));
-  EXPECT_FALSE(TrialTokenValidator::ValidateToken(
-      kSampleToken, insecure_origin_, kAppropriateFeatureName));
+  EXPECT_EQ(TRIAL_TOKEN_STATUS_WRONG_ORIGIN,
+            TrialTokenValidator::ValidateToken(
+                kSampleToken, inappropriate_origin_, kAppropriateFeatureName));
+  EXPECT_EQ(TRIAL_TOKEN_STATUS_WRONG_ORIGIN,
+            TrialTokenValidator::ValidateToken(kSampleToken, insecure_origin_,
+                                               kAppropriateFeatureName));
 }
 
 TEST_F(TrialTokenValidatorTest, ValidateInappropriateFeature) {
-  EXPECT_FALSE(TrialTokenValidator::ValidateToken(
-      kSampleToken, appropriate_origin_, kInappropriateFeatureName));
+  EXPECT_EQ(TRIAL_TOKEN_STATUS_WRONG_FEATURE,
+            TrialTokenValidator::ValidateToken(
+                kSampleToken, appropriate_origin_, kInappropriateFeatureName));
 }
 
 TEST_F(TrialTokenValidatorTest, ValidateInvalidSignature) {
-  EXPECT_FALSE(TrialTokenValidator::ValidateToken(
-      kInvalidSignatureToken, appropriate_origin_, kAppropriateFeatureName));
+  EXPECT_EQ(TRIAL_TOKEN_STATUS_INVALID_SIGNATURE,
+            TrialTokenValidator::ValidateToken(kInvalidSignatureToken,
+                                               appropriate_origin_,
+                                               kAppropriateFeatureName));
 }
 
 TEST_F(TrialTokenValidatorTest, ValidateUnparsableToken) {
-  EXPECT_FALSE(TrialTokenValidator::ValidateToken(
-      kUnparsableToken, appropriate_origin_, kAppropriateFeatureName));
+  EXPECT_EQ(TRIAL_TOKEN_STATUS_MALFORMED,
+            TrialTokenValidator::ValidateToken(kUnparsableToken,
+                                               appropriate_origin_,
+                                               kAppropriateFeatureName));
 }
 
 TEST_F(TrialTokenValidatorTest, ValidateExpiredToken) {
-  EXPECT_FALSE(TrialTokenValidator::ValidateToken(
-      kExpiredToken, appropriate_origin_, kAppropriateFeatureName));
+  EXPECT_EQ(TRIAL_TOKEN_STATUS_EXPIRED,
+            TrialTokenValidator::ValidateToken(
+                kExpiredToken, appropriate_origin_, kAppropriateFeatureName));
 }
 
 TEST_F(TrialTokenValidatorTest, ValidateValidTokenWithIncorrectKey) {
   SetPublicKey(kTestPublicKey2);
-  EXPECT_FALSE(TrialTokenValidator::ValidateToken(
-      kSampleToken, appropriate_origin_, kAppropriateFeatureName));
+  EXPECT_EQ(TRIAL_TOKEN_STATUS_INVALID_SIGNATURE,
+            TrialTokenValidator::ValidateToken(
+                kSampleToken, appropriate_origin_, kAppropriateFeatureName));
 }
 
 }  // namespace content