Support combination of [OriginTrialEnabled] and [SecureContext]

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 f75b6e7981dc25ef4d73f3b08e595250f4157882..65a80736bbdf4945c2b7d0f044cefff1ddf536fd 100644
--- a/third_party/WebKit/Source/bindings/modules/v8/ConditionalFeaturesForModules.cpp
+++ b/third_party/WebKit/Source/bindings/modules/v8/ConditionalFeaturesForModules.cpp
@@ -50,10 +50,7 @@ void InstallConditionalFeaturesForModules(
   v8::Isolate* isolate = script_state->GetIsolate();
   const DOMWrapperWorld& world = script_state->World();
   if (wrapper_type_info == &V8Navigator::wrapperTypeInfo) {
-    // Mimics the [SecureContext] extended attribute. Work-around for
-    // https://crbug.com/695123.
-    if (OriginTrials::installedAppEnabled(execution_context) &&
-        execution_context->IsSecureContext()) {
+    if (OriginTrials::installedAppEnabled(execution_context)) {
       V8NavigatorPartial::installInstalledApp(
           isolate, world, v8::Local<v8::Object>(), prototype_object,
           interface_object);
@@ -63,10 +60,7 @@ void InstallConditionalFeaturesForModules(
                                           v8::Local<v8::Object>(),
                                           prototype_object, interface_object);
     }
-    // Mimics the [SecureContext] extended attribute. Work-around for
-    // https://crbug.com/695123.
-    if (OriginTrials::webUSBEnabled(execution_context) &&
-        execution_context->IsSecureContext()) {
+    if (OriginTrials::webUSBEnabled(execution_context)) {
       V8NavigatorPartial::installWebUSB(isolate, world, v8::Local<v8::Object>(),
                                         prototype_object, interface_object);
     }
@@ -77,10 +71,7 @@ void InstallConditionalFeaturesForModules(
   } else if (wrapper_type_info == &V8Window::wrapperTypeInfo) {
     v8::Local<v8::Object> instance_object =
         script_state->GetContext()->Global();
-    // Mimics the [SecureContext] extended attribute. Work-around for
-    // https://crbug.com/695123.
-    if (OriginTrials::webUSBEnabled(execution_context) &&
-        execution_context->IsSecureContext()) {
+    if (OriginTrials::webUSBEnabled(execution_context)) {
       V8WindowPartial::installWebUSB(isolate, world, instance_object,
                                      prototype_object, interface_object);
     }