Allow origin trials to be enabled by script

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..6631cc242e0a7ab05d24014f80478af5576f3904 100644
--- a/third_party/WebKit/Source/core/origin_trials/OriginTrialContext.cpp
+++ b/third_party/WebKit/Source/core/origin_trials/OriginTrialContext.cpp
@@ -20,6 +20,7 @@
 #include "public/platform/WebOriginTrialTokenStatus.h"
 #include "public/platform/WebSecurityOrigin.h"
 #include "public/platform/WebTrialTokenValidator.h"
+#include "wtf/Vector.h"
 #include "wtf/text/StringBuilder.h"
 
 #include <v8.h>
@@ -154,24 +155,37 @@ std::unique_ptr<Vector<String>> OriginTrialContext::getTokens(
 }
 
 void OriginTrialContext::addToken(const String& token) {
-  if (!token.isEmpty()) {
-    m_tokens.push_back(token);
-    validateToken(token);
+  if (token.isEmpty())
+    return;
+  m_tokens.push_back(token);
+  if (validateToken(token)) {
+    // Only install pending features if the provided token is valid. Otherwise,
+    // there was no change to the list of enabled features.
+    initializePendingFeatures();
   }
-  initializePendingFeatures();
 }
 
 void OriginTrialContext::addTokens(const Vector<String>& tokens) {
+  if (tokens.isEmpty())
+    return;
+  bool foundValid = false;
   for (const String& token : tokens) {
     if (!token.isEmpty()) {
       m_tokens.push_back(token);
-      validateToken(token);
+      if (validateToken(token))
+        foundValid = true;
     }
   }
-  initializePendingFeatures();
+  if (foundValid) {
+    // Only install pending features if at least one of the provided token are
+    // valid. Otherwise, there was no change to the list of enabled features.
+    initializePendingFeatures();
+  }
 }
 
 void OriginTrialContext::initializePendingFeatures() {
+  if (!m_enabledTrials.size())
+    return;
   if (!m_host->isDocument())
     return;
   LocalFrame* frame = toDocument(m_host.get())->frame();
@@ -183,7 +197,12 @@ void OriginTrialContext::initializePendingFeatures() {
   if (!scriptState->contextIsValid())
     return;
   ScriptState::Scope scope(scriptState);
-  installPendingConditionalFeaturesOnWindow(scriptState);
+  for (auto enabledTrial : m_enabledTrials) {
+    if (m_installedTrials.contains(enabledTrial))
+      continue;
+    if (installPendingConditionalFeature(scriptState, enabledTrial))
+      m_installedTrials.add(enabledTrial);
+  }
 }
 
 bool OriginTrialContext::isTrialEnabled(const String& trialName) {
@@ -193,30 +212,34 @@ bool OriginTrialContext::isTrialEnabled(const String& trialName) {
   return m_enabledTrials.contains(trialName);
 }
 
-void OriginTrialContext::validateToken(const String& token) {
+bool OriginTrialContext::validateToken(const String& token) {
   DCHECK(!token.isEmpty());
+  bool valid = false;
 
   // Origin trials are only enabled for secure origins
   if (!m_host->isSecureContext()) {
     tokenValidationResultHistogram().count(
         static_cast<int>(WebOriginTrialTokenStatus::Insecure));
-    return;
+    return valid;

[iclelland, 2017/01/20 14:31:19]

I'd return false explicitly here for clarity

[chasej, 2017/01/25 19:58:20]

Done.

   }
 
   if (!m_trialTokenValidator) {
     tokenValidationResultHistogram().count(
         static_cast<int>(WebOriginTrialTokenStatus::NotSupported));
-    return;
+    return valid;

[iclelland, 2017/01/20 14:31:19]

Ditto

[chasej, 2017/01/25 19:58:20]

Done.

   }
 
   WebSecurityOrigin origin(m_host->getSecurityOrigin());
   WebString trialName;
   WebOriginTrialTokenStatus tokenResult =
       m_trialTokenValidator->validateToken(token, origin, &trialName);
-  if (tokenResult == WebOriginTrialTokenStatus::Success)
+  if (tokenResult == WebOriginTrialTokenStatus::Success) {
+    valid = true;
     m_enabledTrials.add(trialName);
+  }
 
   tokenValidationResultHistogram().count(static_cast<int>(tokenResult));
+  return valid;
 }
 
 DEFINE_TRACE(OriginTrialContext) {