[Experimental Framework] Make the OriginTrialContext a member of ExecutionContext

third_party/WebKit/Source/core/testing/NullExecutionContext.cpp

Index: third_party/WebKit/Source/core/testing/NullExecutionContext.cpp
diff --git a/third_party/WebKit/Source/core/testing/NullExecutionContext.cpp b/third_party/WebKit/Source/core/testing/NullExecutionContext.cpp
index f2a649d52e4917673cd519163b4d843e9a4e5eed..a52527e70dfe9053793f5db47da7cbb4dc03871b 100644
--- a/third_party/WebKit/Source/core/testing/NullExecutionContext.cpp
+++ b/third_party/WebKit/Source/core/testing/NullExecutionContext.cpp
@@ -25,6 +25,7 @@ public:
 
 NullExecutionContext::NullExecutionContext()
     : m_tasksNeedSuspension(false)
+    , m_isSecureContext(true)
     , m_queue(adoptPtrWillBeNoop(new NullEventQueue()))
 {
 }
@@ -33,9 +34,16 @@ void NullExecutionContext::postTask(const WebTraceLocation&, PassOwnPtr<Executio
 {
 }
 
+void NullExecutionContext::setIsSecureContext(bool isSecureContext)
+{
+    m_isSecureContext = isSecureContext;
+}
+
 bool NullExecutionContext::isSecureContext(String& errorMessage, const SecureContextCheck privilegeContextCheck) const
 {
-    return true;
+    if (!m_isSecureContext)
+        errorMessage = "A secure context is required";
+    return m_isSecureContext;
 }
 
 } // namespace blink