[Origin Trials] Only flag feature bindings installed after all install methods have returned

third_party/WebKit/Source/bindings/core/v8/V8Binding.cpp

 /*
  * Copyright (C) 2006, 2007, 2008, 2009 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:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 39 matching lines @@
 #include "core/dom/Element.h"
 #include "core/dom/FlexibleArrayBufferView.h"
 #include "core/dom/NodeFilter.h"
 #include "core/dom/QualifiedName.h"
 #include "core/frame/LocalDOMWindow.h"
 #include "core/frame/LocalFrame.h"
 #include "core/frame/Settings.h"
 #include "core/inspector/InspectorTraceEvents.h"
 #include "core/loader/FrameLoader.h"
 #include "core/loader/FrameLoaderClient.h"
+#include "core/origin_trials/OriginTrialContext.h"
 #include "core/workers/WorkerGlobalScope.h"
 #include "core/workers/WorkletGlobalScope.h"
 #include "core/xml/XPathNSResolver.h"
 #include "platform/TracedValue.h"
 #include "wtf/MathExtras.h"
 #include "wtf/StdLibExtras.h"
 #include "wtf/Threading.h"
 #include "wtf/text/AtomicString.h"
 #include "wtf/text/CString.h"
 #include "wtf/text/CharacterNames.h"
@@ skipping 741 matching lines @@
     // Initialization code for origin trials for core bindings, if necessary,
     // should go here.
 }
 
 namespace {
 InstallOriginTrialsFunction s_installOriginTrialsFunction = &installOriginTrialsCore;
 }
 
 void installOriginTrials(ScriptState* scriptState)
 {
+    v8::Local<v8::Context> context = scriptState->context();
+    ExecutionContext* executionContext = toExecutionContext(context);
+    OriginTrialContext* originTrialContext = OriginTrialContext::from(executionContext, OriginTrialContext::DontCreateIfNotExists);
+    if (!originTrialContext)
+        return;
+
+    ScriptState::Scope scope(scriptState);
+
     (*s_installOriginTrialsFunction)(scriptState);
+
+    // Mark each enabled feature as having been installed.
+    if (!originTrialContext->featureBindingsInstalled("DurableStorage") && (RuntimeEnabledFeatures::durableStorageEnabled() || originTrialContext->isFeatureEnabled("DurableStorage", nullptr))) {
+        originTrialContext->setFeatureBindingsInstalled("DurableStorage");
+    }
 }
 
 InstallOriginTrialsFunction setInstallOriginTrialsFunction(InstallOriginTrialsFunction newInstallOriginTrialsFunction)
 {
     InstallOriginTrialsFunction originalFunction = s_installOriginTrialsFunction;
     s_installOriginTrialsFunction = newInstallOriginTrialsFunction;
     return originalFunction;
 }
 
 void crashIfIsolateIsDead(v8::Isolate* isolate)
@@ skipping 98 matching lines @@
     v8SetReturnValue(info, perContextData->constructorForType(WrapperTypeInfo::unwrap(data)));
 }
 
 v8::Local<v8::Value> freezeV8Object(v8::Local<v8::Value> value, v8::Isolate* isolate)
 {
     v8CallOrCrash(value.As<v8::Object>()->SetIntegrityLevel(isolate->GetCurrentContext(), v8::IntegrityLevel::kFrozen));
     return value;
 }
 
 } // namespace blink