[Experimental Framework] Make the OriginTrialContext a member of ExecutionContext

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

 /*
  * Copyright (C) 2008 Apple Inc. All Rights Reserved.
  * Copyright (C) 2012 Google Inc. All Rights Reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
@@ skipping 16 matching lines @@
 
 #ifndef ExecutionContext_h
 #define ExecutionContext_h
 
 #include "core/CoreExport.h"
 #include "core/dom/ContextLifecycleNotifier.h"
 #include "core/dom/ContextLifecycleObserver.h"
 #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"
 #include "platform/weborigin/ReferrerPolicy.h"
 #include "wtf/Deque.h"
 #include "wtf/Noncopyable.h"
 #include "wtf/OwnPtr.h"
 #include "wtf/PassOwnPtr.h"
 
 namespace blink {
@@ skipping 105 matching lines @@
     bool isWindowInteractionAllowed() const;
 
     // Decides whether this context is privileged, as described in
     // https://w3c.github.io/webappsec/specs/powerfulfeatures/#settings-privileged.
     virtual bool isSecureContext(String& errorMessage, const SecureContextCheck = StandardSecureContextCheck) const = 0;
     virtual bool isSecureContext(const SecureContextCheck = StandardSecureContextCheck) const;
 
     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();
 
     virtual const KURL& virtualURL() const = 0;
     virtual KURL virtualCompleteURL(const String&) const = 0;
 
 private:
     bool dispatchErrorEvent(PassRefPtrWillBeRawPtr<ErrorEvent>, AccessControlStatus);
     void runSuspendableTasks();
@@ skipping 23 matching lines @@
 
     Deque<OwnPtr<SuspendableTask>> m_suspendedTasks;
     bool m_isRunSuspendableTasksScheduled;
 
     ReferrerPolicy m_referrerPolicy;
 };
 
 } // namespace blink
 
 #endif // ExecutionContext_h