content/renderer/origin_trials/trial_token_validator.cc - Issue 1752463002: Cleanup TrialToken in preparation of moving it to content/common.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/renderer/origin_trials/trial_token_validator.cc

Issue 1752463002: Cleanup TrialToken in preparation of moving it to content/common. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: nits Created 4 years, 9 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « content/renderer/origin_trials/trial_token_validator.h ('k') | content/renderer/origin_trials/trial_token_validator_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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..f34afd1a70fcedd4310ea809978a3a6d8f20153d 100644

--- a/content/renderer/origin_trials/trial_token_validator.cc

+++ b/content/renderer/origin_trials/trial_token_validator.cc

@@ -15,7 +15,7 @@ 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());

@@ -26,7 +26,7 @@ bool TrialTokenValidator::validateToken(const blink::WebString& token,

content_client->renderer()->GetOriginTrialPublicKey();

return !public_key.empty() && trial_token &&

- trial_token->IsAppropriate(origin.utf8(), featureName.utf8()) &&

+ trial_token->IsAppropriate(origin, featureName.utf8()) &&

trial_token->IsValid(base::Time::Now(), public_key);

}