[Experimental Framework] Make the OriginTrialContext a member of ExecutionContext

third_party/WebKit/Source/core/dom/ExecutionContext.h

Index: third_party/WebKit/Source/core/dom/ExecutionContext.h
diff --git a/third_party/WebKit/Source/core/dom/ExecutionContext.h b/third_party/WebKit/Source/core/dom/ExecutionContext.h
index acafd94fd9d5c1930c25f1a6fbb565d7345edc58..7d1706d2f9a7674c7b2f8c14a649b311c0669309 100644
--- a/third_party/WebKit/Source/core/dom/ExecutionContext.h
+++ b/third_party/WebKit/Source/core/dom/ExecutionContext.h
@@ -34,6 +34,7 @@
 #include "core/dom/SecurityContext.h"
 #include "core/dom/SuspendableTask.h"
 #include "core/fetch/AccessControlStatus.h"
+#include "core/origin_trials/OriginTrialContext.h"

[jbroman, 2016/03/04 15:23:48]

nit: ExecutionContext.h is a header included in lots of places; would a forward
declaration be enough? (You might need to move the default implementation of
createOriginTrialContext to ExecutionContext.cpp for the non-Oilpan build to be
happy, but otherwise it should work.)

[iclelland, 2016/03/07 15:38:37]

Thanks, done.

 #include "platform/Supplementable.h"
 #include "platform/heap/Handle.h"
 #include "platform/weborigin/KURL.h"
@@ -159,6 +160,9 @@ public:
     virtual void setReferrerPolicy(ReferrerPolicy);
     ReferrerPolicy getReferrerPolicy() const { return m_referrerPolicy; }
 
+    // Override to enable experimental features through origin trials
+    virtual PassOwnPtrWillBeRawPtr<OriginTrialContext> createOriginTrialContext() { return nullptr; }
+
 protected:
     ExecutionContext();
     virtual ~ExecutionContext();