third_party/WebKit/Source/core/origin_trials/OriginTrialContext.cpp - 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: third_party/WebKit/Source/core/origin_trials/OriginTrialContext.cpp

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_unittest.cc ('k') | third_party/WebKit/Source/core/origin_trials/OriginTrialContextTest.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/origin_trials/OriginTrialContext.cpp

diff --git a/third_party/WebKit/Source/core/origin_trials/OriginTrialContext.cpp b/third_party/WebKit/Source/core/origin_trials/OriginTrialContext.cpp

index ae76e45bf3e223645e336f66eec5aedaaea7744d..6d3f81da71111c51b9c5f3b4e3e81f5b73e912e3 100644

--- a/third_party/WebKit/Source/core/origin_trials/OriginTrialContext.cpp

+++ b/third_party/WebKit/Source/core/origin_trials/OriginTrialContext.cpp

@@ -11,17 +11,13 @@

#include "platform/RuntimeEnabledFeatures.h"

#include "platform/weborigin/SecurityOrigin.h"

#include "public/platform/Platform.h"

+#include "public/platform/WebSecurityOrigin.h"

#include "public/platform/WebTrialTokenValidator.h"

namespace blink {

namespace {

-String getCurrentOrigin(ExecutionContext* executionContext)

- return executionContext->getSecurityOrigin()->toString();

String getDisabledMessage(const String& featureName)

{

// TODO(chasej): Update message with URL to experiments site, when live

@@ -74,7 +70,7 @@ bool OriginTrialContext::isFeatureEnabled(const String& featureName, String* err

bool OriginTrialContext::hasValidToken(Vector<String> tokens, const String& featureName, String* errorMessage, WebTrialTokenValidator* validator)

{

- String origin = getCurrentOrigin(getExecutionContext());

+ WebSecurityOrigin origin(getExecutionContext()->getSecurityOrigin());

for (const String& token : tokens) {

// Check with the validator service to verify the signature.