Eagerly install Origin Trial features on window

third_party/WebKit/Source/bindings/modules/v8/ConditionalFeaturesForModules.cpp

Index: third_party/WebKit/Source/bindings/modules/v8/ConditionalFeaturesForModules.cpp
diff --git a/third_party/WebKit/Source/bindings/modules/v8/ConditionalFeaturesForModules.cpp b/third_party/WebKit/Source/bindings/modules/v8/ConditionalFeaturesForModules.cpp
index 5213e83fb6f3357c5bcce680b3992a7247b2040c..79d31f5a9584b302568a48e3a9e45887c41d44bf 100644
--- a/third_party/WebKit/Source/bindings/modules/v8/ConditionalFeaturesForModules.cpp
+++ b/third_party/WebKit/Source/bindings/modules/v8/ConditionalFeaturesForModules.cpp
@@ -43,56 +43,52 @@ void installConditionalFeaturesForModules(
   ExecutionContext* executionContext = scriptState->getExecutionContext();
   if (!executionContext)
     return;
-  v8::Isolate* isolate = scriptState->isolate();
-  const DOMWrapperWorld& world = scriptState->world();
   v8::Local<v8::Object> global = scriptState->context()->Global();
   if (wrapperTypeInfo == &V8Navigator::wrapperTypeInfo) {
     if (OriginTrials::webShareEnabled(executionContext)) {
-      V8NavigatorPartial::installWebShare(isolate, world,
-                                          v8::Local<v8::Object>(),
+      V8NavigatorPartial::installWebShare(scriptState, v8::Local<v8::Object>(),
                                           prototypeObject, interfaceObject);
     }
     if (OriginTrials::webUSBEnabled(executionContext)) {
-      V8NavigatorPartial::installWebUSB(isolate, world, v8::Local<v8::Object>(),
+      V8NavigatorPartial::installWebUSB(scriptState, v8::Local<v8::Object>(),
                                         prototypeObject, interfaceObject);
     }
     if (OriginTrials::webVREnabled(executionContext)) {
-      V8NavigatorPartial::installWebVR(isolate, world, global, prototypeObject,
+      V8NavigatorPartial::installWebVR(scriptState, global, prototypeObject,
                                        interfaceObject);
     }
   } else if (wrapperTypeInfo == &V8Window::wrapperTypeInfo) {
     if (OriginTrials::webUSBEnabled(executionContext)) {
-      V8WindowPartial::installWebUSB(isolate, world, global, prototypeObject,
+      V8WindowPartial::installWebUSB(scriptState, global, prototypeObject,
                                      interfaceObject);
     }
     if (OriginTrials::webVREnabled(executionContext)) {
-      V8WindowPartial::installWebVR(isolate, world, global, prototypeObject,
+      V8WindowPartial::installWebVR(scriptState, global, prototypeObject,
                                     interfaceObject);
     }
     if (OriginTrials::gamepadExtensionsEnabled(executionContext)) {
       V8WindowPartial::installGamepadExtensions(
-          isolate, world, global, prototypeObject, interfaceObject);
+          scriptState, global, prototypeObject, interfaceObject);
     }
   } else if (wrapperTypeInfo == &V8ServiceWorkerGlobalScope::wrapperTypeInfo) {
     if (OriginTrials::foreignFetchEnabled(executionContext)) {
       V8ServiceWorkerGlobalScope::installForeignFetch(
-          isolate, world, global, prototypeObject, interfaceObject);
+          scriptState, global, prototypeObject, interfaceObject);
     }
   } else if (wrapperTypeInfo == &V8InstallEvent::wrapperTypeInfo) {
     if (OriginTrials::foreignFetchEnabled(executionContext)) {
-      V8InstallEvent::installForeignFetch(isolate, world,
-                                          v8::Local<v8::Object>(),
+      V8InstallEvent::installForeignFetch(scriptState, v8::Local<v8::Object>(),
                                           prototypeObject, interfaceObject);
     }
   } else if (wrapperTypeInfo == &V8Gamepad::wrapperTypeInfo) {
     if (OriginTrials::gamepadExtensionsEnabled(executionContext)) {
-      V8Gamepad::installGamepadExtensions(isolate, world, global,
-                                          prototypeObject, interfaceObject);
+      V8Gamepad::installGamepadExtensions(scriptState, global, prototypeObject,
+                                          interfaceObject);
     }
   } else if (wrapperTypeInfo == &V8GamepadButton::wrapperTypeInfo) {
     if (OriginTrials::gamepadExtensionsEnabled(executionContext)) {
       V8GamepadButton::installGamepadExtensions(
-          isolate, world, global, prototypeObject, interfaceObject);
+          scriptState, global, prototypeObject, interfaceObject);
     }
   }
 }