Collect UMA data for Origin Trials

third_party/WebKit/Source/core/origin_trials/OriginTrialContextTest.cpp

Index: third_party/WebKit/Source/core/origin_trials/OriginTrialContextTest.cpp
diff --git a/third_party/WebKit/Source/core/origin_trials/OriginTrialContextTest.cpp b/third_party/WebKit/Source/core/origin_trials/OriginTrialContextTest.cpp
index 64a24a383e3502e068aad4d1f70c5e54788ed8be..892068de78bd517630d3825df1ef900cdc8d4b60 100644
--- a/third_party/WebKit/Source/core/origin_trials/OriginTrialContextTest.cpp
+++ b/third_party/WebKit/Source/core/origin_trials/OriginTrialContextTest.cpp
@@ -33,27 +33,27 @@ const char kGoodToken[] = "AnySignatureWillDo|https://www.example.com|Frobulate|
 class MockTokenValidator : public WebTrialTokenValidator {
 public:
     MockTokenValidator()
-        : m_response(false)
+        : m_response(TokenValidationResultNotSupported)
         , m_callCount(0)
     {
     }
     ~MockTokenValidator() override {}
 
     // blink::WebTrialTokenValidator implementation
-    bool validateToken(const blink::WebString& token, const blink::WebSecurityOrigin& origin, const blink::WebString& featureName) override
+    TokenValidationResult validateToken(const blink::WebString& token, const blink::WebSecurityOrigin& origin, const blink::WebString& featureName) override
     {
         m_callCount++;
         return m_response;
     }
 
     // Useful methods for controlling the validator
-    void setResponse(bool response)
+    void setResponse(TokenValidationResult response)
     {
         m_response = response;
     }
     void reset()

[Marijn Kruisselbrink, 2016/04/22 21:51:06]

Maybe while you're editing this file anyway, you could just get rid of reset()
since it isn't actually used anywhere.

[chasej, 2016/04/25 20:32:52]

Done.

     {
-        m_response = false;
+        m_response = TokenValidationResultNotSupported;
         m_callCount = 0;
     }
     int callCount()
@@ -62,7 +62,7 @@ public:
     }
 
 private:
-    bool m_response;
+    TokenValidationResult m_response;
     int m_callCount;
 
     DISALLOW_COPY_AND_ASSIGN(MockTokenValidator);
@@ -139,7 +139,7 @@ TEST_F(OriginTrialContextTest, EnabledNonExistingFeatureWithoutErrorMessage)
 TEST_F(OriginTrialContextTest, EnabledSecureRegisteredOrigin)
 {
     String errorMessage;
-    tokenValidator()->setResponse(true);
+    tokenValidator()->setResponse(WebTrialTokenValidator::TokenValidationResultSuccess);
     bool isOriginEnabled = isFeatureEnabled(kFrobulateEnabledOrigin,
         kFrobulateFeatureName,
         kGoodToken,
@@ -154,7 +154,7 @@ TEST_F(OriginTrialContextTest, EnabledSecureRegisteredOrigin)
 TEST_F(OriginTrialContextTest, InvalidTokenResponseFromPlatform)
 {
     String errorMessage;
-    tokenValidator()->setResponse(false);
+    tokenValidator()->setResponse(WebTrialTokenValidator::TokenValidationResultNotSupported);
     bool isOriginEnabled = isFeatureEnabled(kFrobulateEnabledOrigin,
         kFrobulateFeatureName,
         kGoodToken,
@@ -168,7 +168,7 @@ TEST_F(OriginTrialContextTest, OnlyOneErrorMessageGenerated)
 {
     String errorMessage1;
     String errorMessage2;
-    tokenValidator()->setResponse(false);
+    tokenValidator()->setResponse(WebTrialTokenValidator::TokenValidationResultNotSupported);
     isFeatureEnabled(kFrobulateEnabledOrigin, kFrobulateFeatureName, kGoodToken, &errorMessage1);
     isFeatureEnabled(kFrobulateEnabledOrigin, kFrobulateFeatureName, kGoodToken, &errorMessage2);
     EXPECT_FALSE(errorMessage1.isEmpty());
@@ -178,7 +178,7 @@ TEST_F(OriginTrialContextTest, OnlyOneErrorMessageGenerated)
 TEST_F(OriginTrialContextTest, ErrorMessageClearedIfStringReused)
 {
     String errorMessage;
-    tokenValidator()->setResponse(false);
+    tokenValidator()->setResponse(WebTrialTokenValidator::TokenValidationResultNotSupported);
     isFeatureEnabled(kFrobulateEnabledOrigin, kFrobulateFeatureName, kGoodToken, &errorMessage);
     EXPECT_FALSE(errorMessage.isEmpty());
     isFeatureEnabled(kFrobulateEnabledOrigin, kFrobulateFeatureName, kGoodToken, &errorMessage);
@@ -189,7 +189,7 @@ TEST_F(OriginTrialContextTest, ErrorMessageGeneratedPerFeature)
 {
     String errorMessage1;
     String errorMessage2;
-    tokenValidator()->setResponse(false);
+    tokenValidator()->setResponse(WebTrialTokenValidator::TokenValidationResultNotSupported);
     isFeatureEnabled(kFrobulateEnabledOrigin, kFrobulateFeatureName, kGoodToken, &errorMessage1);
     isFeatureEnabled(kFrobulateEnabledOrigin, kNonExistingFeatureName, kGoodToken, &errorMessage2);
     EXPECT_FALSE(errorMessage1.isEmpty());
@@ -198,7 +198,7 @@ TEST_F(OriginTrialContextTest, ErrorMessageGeneratedPerFeature)
 
 TEST_F(OriginTrialContextTest, EnabledSecureRegisteredOriginWithoutErrorMessage)
 {
-    tokenValidator()->setResponse(true);
+    tokenValidator()->setResponse(WebTrialTokenValidator::TokenValidationResultSuccess);
     bool isOriginEnabled = isFeatureEnabledWithoutErrorMessage(
         kFrobulateEnabledOrigin,
         kFrobulateFeatureName,