| Index: third_party/WebKit/Source/core/dom/ExecutionContext.cpp
|
| diff --git a/third_party/WebKit/Source/core/dom/ExecutionContext.cpp b/third_party/WebKit/Source/core/dom/ExecutionContext.cpp
|
| index 5f2ecb70489aa509538ab0da80e70ad91d6893c7..d89adfec48052749d7c2c0de395d90a0db64e946 100644
|
| --- a/third_party/WebKit/Source/core/dom/ExecutionContext.cpp
|
| +++ b/third_party/WebKit/Source/core/dom/ExecutionContext.cpp
|
| @@ -36,10 +36,13 @@
|
| #include "core/frame/UseCounter.h"
|
| #include "core/html/PublicURLManager.h"
|
| #include "core/inspector/InspectorInstrumentation.h"
|
| +#include "core/origin_trials/OriginTrialContext.h"
|
| +#include "core/origin_trials/OriginTrials.h"
|
| #include "core/workers/WorkerGlobalScope.h"
|
| #include "core/workers/WorkerThread.h"
|
| #include "platform/RuntimeEnabledFeatures.h"
|
| #include "wtf/MainThread.h"
|
| +#include "wtf/PassOwnPtr.h"
|
|
|
| namespace blink {
|
|
|
| @@ -206,6 +209,14 @@ int ExecutionContext::circularSequentialID()
|
| return m_circularSequentialID;
|
| }
|
|
|
| +OriginTrials* ExecutionContext::originTrials()
|
| +{
|
| + if (!m_originTrials) {
|
| + m_originTrials = adoptPtr(new OriginTrials(originTrialContext()));
|
| + }
|
| + return m_originTrials.get();
|
| +}
|
| +
|
| PublicURLManager& ExecutionContext::publicURLManager()
|
| {
|
| if (!m_publicURLManager)
|
|
|