third_party/WebKit/Source/core/origin_trials/testing/InternalsFrobulate.cpp - Issue 1743623002: [Experimental Framework] Make the OriginTrialContext a member of ExecutionContext

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/testing/InternalsFrobulate.cpp

Issue 1743623002: [Experimental Framework] Make the OriginTrialContext a member of ExecutionContext (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Clean up unused headers Created 4 years, 10 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

« third_party/WebKit/Source/core/origin_trials/DocumentOriginTrialContextTest.cpp ('K') | « third_party/WebKit/Source/core/origin_trials/OriginTrialContextTest.cpp ('k') | third_party/WebKit/Source/core/testing/NullExecutionContext.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/origin_trials/testing/InternalsFrobulate.cpp

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

index f2b361faf60643d6c4c63fdd99a320308bd31333..9073c648738073aa13a5db82ea27774a1f0868f5 100644

--- a/third_party/WebKit/Source/core/origin_trials/testing/InternalsFrobulate.cpp

+++ b/third_party/WebKit/Source/core/origin_trials/testing/InternalsFrobulate.cpp

@@ -6,6 +6,7 @@

#include "bindings/core/v8/ExceptionState.h"

#include "core/dom/ExceptionCode.h"

+#include "core/dom/ExecutionContext.h"

jbroman 2016/03/04 15:23:48 I don't think this include is required anymore.

iclelland 2016/03/07 15:38:37 Done.

#include "core/origin_trials/OriginTrials.h"

namespace blink {

@@ -14,7 +15,7 @@ namespace blink {

bool InternalsFrobulate::frobulate(ScriptState* scriptState, Internals& internals, ExceptionState& exceptionState)

{

String errorMessage;

- if (!OriginTrials::experimentalFrameworkSampleAPIEnabled(scriptState->executionContext(), errorMessage)) {

+ if (!OriginTrials::from(scriptState->executionContext())->experimentalFrameworkSampleAPIEnabled(errorMessage)) {

exceptionState.throwDOMException(NotSupportedError, errorMessage);

return false;

}