Use a new Supplement constructor for supplements in core/

third_party/WebKit/Source/core/origin_trials/OriginTrialContext.cpp

Index: third_party/WebKit/Source/core/origin_trials/OriginTrialContext.cpp
diff --git a/third_party/WebKit/Source/core/origin_trials/OriginTrialContext.cpp b/third_party/WebKit/Source/core/origin_trials/OriginTrialContext.cpp
index 3873ac74866b1958cb3d882afdffcafbd7faa330..a3f5aac99262c00e3bec335638bdbc5385b3fdf8 100644
--- a/third_party/WebKit/Source/core/origin_trials/OriginTrialContext.cpp
+++ b/third_party/WebKit/Source/core/origin_trials/OriginTrialContext.cpp
@@ -85,9 +85,9 @@ String extractTokenOrQuotedString(const String& headerValue, unsigned& pos) {
 
 }  // namespace
 
-OriginTrialContext::OriginTrialContext(ExecutionContext* host,
+OriginTrialContext::OriginTrialContext(ExecutionContext& context,
                                        WebTrialTokenValidator* validator)
-    : m_host(host), m_trialTokenValidator(validator) {}
+    : Supplement<ExecutionContext>(context), m_trialTokenValidator(validator) {}
 
 // static
 const char* OriginTrialContext::supplementName() {
@@ -95,14 +95,14 @@ const char* OriginTrialContext::supplementName() {
 }
 
 // static
-OriginTrialContext* OriginTrialContext::from(ExecutionContext* host,
+OriginTrialContext* OriginTrialContext::from(ExecutionContext* context,
                                              CreateMode create) {
   OriginTrialContext* originTrials = static_cast<OriginTrialContext*>(
-      Supplement<ExecutionContext>::from(host, supplementName()));
+      Supplement<ExecutionContext>::from(context, supplementName()));
   if (!originTrials && create == CreateIfNotExists) {
     originTrials = new OriginTrialContext(
-        host, Platform::current()->trialTokenValidator());
-    Supplement<ExecutionContext>::provideTo(*host, supplementName(),
+        *context, Platform::current()->trialTokenValidator());
+    Supplement<ExecutionContext>::provideTo(*context, supplementName(),
                                             originTrials);
   }
   return originTrials;
@@ -126,28 +126,28 @@ std::unique_ptr<Vector<String>> OriginTrialContext::parseHeaderValue(
 }
 
 // static
-void OriginTrialContext::addTokensFromHeader(ExecutionContext* host,
+void OriginTrialContext::addTokensFromHeader(ExecutionContext* context,
                                              const String& headerValue) {
   if (headerValue.isEmpty())
     return;
   std::unique_ptr<Vector<String>> tokens(parseHeaderValue(headerValue));
   if (!tokens)
     return;
-  addTokens(host, tokens.get());
+  addTokens(context, tokens.get());
 }
 
 // static
-void OriginTrialContext::addTokens(ExecutionContext* host,
+void OriginTrialContext::addTokens(ExecutionContext* context,
                                    const Vector<String>* tokens) {
   if (!tokens || tokens->isEmpty())
     return;
-  from(host)->addTokens(*tokens);
+  from(context)->addTokens(*tokens);
 }
 
 // static
 std::unique_ptr<Vector<String>> OriginTrialContext::getTokens(
-    ExecutionContext* host) {
-  OriginTrialContext* context = from(host, DontCreateIfNotExists);
+    ExecutionContext* executionContext) {
+  OriginTrialContext* context = from(executionContext, DontCreateIfNotExists);
   if (!context || context->m_tokens.isEmpty())
     return nullptr;
   return std::unique_ptr<Vector<String>>(new Vector<String>(context->m_tokens));
@@ -172,9 +172,9 @@ void OriginTrialContext::addTokens(const Vector<String>& tokens) {
 }
 
 void OriginTrialContext::initializePendingFeatures() {
-  if (!m_host->isDocument())
+  if (!supplementable()->isDocument())
     return;
-  LocalFrame* frame = toDocument(m_host.get())->frame();
+  LocalFrame* frame = toDocument(supplementable())->frame();
   if (!frame)
     return;
   ScriptState* scriptState = ScriptState::forMainWorld(frame);
@@ -197,7 +197,7 @@ void OriginTrialContext::validateToken(const String& token) {
   DCHECK(!token.isEmpty());
 
   // Origin trials are only enabled for secure origins
-  if (!m_host->isSecureContext()) {
+  if (!supplementable()->isSecureContext()) {
     tokenValidationResultHistogram().count(
         static_cast<int>(WebOriginTrialTokenStatus::Insecure));
     return;
@@ -209,7 +209,7 @@ void OriginTrialContext::validateToken(const String& token) {
     return;
   }
 
-  WebSecurityOrigin origin(m_host->getSecurityOrigin());
+  WebSecurityOrigin origin(supplementable()->getSecurityOrigin());
   WebString trialName;
   WebOriginTrialTokenStatus tokenResult =
       m_trialTokenValidator->validateToken(token, origin, &trialName);
@@ -220,7 +220,6 @@ void OriginTrialContext::validateToken(const String& token) {
 }
 
 DEFINE_TRACE(OriginTrialContext) {
-  visitor->trace(m_host);
   Supplement<ExecutionContext>::trace(visitor);
 }