Cleanup TrialToken in preparation of moving it to content/common.

content/renderer/origin_trials/trial_token_validator.cc

Index: content/renderer/origin_trials/trial_token_validator.cc
diff --git a/content/renderer/origin_trials/trial_token_validator.cc b/content/renderer/origin_trials/trial_token_validator.cc
index 1df8dc78c3d1c193d4f036aa1a5f4cca7232d6a8..085558b2082ee2f222f3025c5781c278d86427ca 100644
--- a/content/renderer/origin_trials/trial_token_validator.cc
+++ b/content/renderer/origin_trials/trial_token_validator.cc
@@ -8,6 +8,7 @@
 #include "content/public/common/content_client.h"
 #include "content/public/renderer/content_renderer_client.h"
 #include "content/renderer/origin_trials/trial_token.h"
+#include "third_party/WebKit/public/platform/URLConversion.h"

[iclelland, 2016/03/02 22:36:29]

What's this include for?

[Marijn Kruisselbrink, 2016/03/02 22:43:12]

Nothing. Leftover from before I changed the origin parameter to be a
blink::WebSecurityOrigin.

 
 namespace content {
 
@@ -15,19 +16,10 @@ TrialTokenValidator::TrialTokenValidator() {}
 TrialTokenValidator::~TrialTokenValidator() {}
 
 bool TrialTokenValidator::validateToken(const blink::WebString& token,
-                                        const blink::WebString& origin,
+                                        const blink::WebSecurityOrigin& origin,
                                         const blink::WebString& featureName) {
   scoped_ptr<TrialToken> trial_token = TrialToken::Parse(token.utf8());
-
-  ContentClient* content_client = GetContentClient();
-  CHECK(content_client);
-
-  base::StringPiece public_key =
-      content_client->renderer()->GetOriginTrialPublicKey();
-
-  return !public_key.empty() && trial_token &&
-         trial_token->IsAppropriate(origin.utf8(), featureName.utf8()) &&
-         trial_token->IsValid(base::Time::Now(), public_key);
+  return trial_token && trial_token->Verify(origin, featureName.utf8());
 }
 
 }  // namespace content