Support combination of [OriginTrialEnabled] and [SecureContext]

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

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "bindings/modules/v8/ConditionalFeaturesForModules.h"
 
 #include "bindings/core/v8/ConditionalFeaturesForCore.h"
 #include "bindings/core/v8/V8DedicatedWorkerGlobalScope.h"
 #include "bindings/core/v8/V8Navigator.h"
 #include "bindings/core/v8/V8SharedWorkerGlobalScope.h"
@@ skipping 32 matching lines @@
   // files. (crbug.com/615060)
   (*g_original_install_conditional_features_function)(
       wrapper_type_info, script_state, prototype_object, interface_object);
 
   ExecutionContext* execution_context = ExecutionContext::From(script_state);
   if (!execution_context)
     return;
   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);
     }
     if (OriginTrials::webShareEnabled(execution_context)) {
       V8NavigatorPartial::installWebShare(isolate, world,
                                           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);
     }
     if (OriginTrials::webVREnabled(execution_context)) {
       V8NavigatorPartial::installWebVR(isolate, world, v8::Local<v8::Object>(),
                                        prototype_object, interface_object);
     }
   } else if (wrapper_type_info == &V8Window::wrapperTypeInfo) {
     v8::Local<v8::Object> instance_object =
         script_state->GetContext()->Global();
@@ skipping 134 matching lines @@
   RegisterInstallConditionalFeaturesForCore();
   g_original_install_conditional_features_function =
       SetInstallConditionalFeaturesFunction(
           &InstallConditionalFeaturesForModules);
   g_original_install_pending_conditional_feature_function =
       SetInstallPendingConditionalFeatureFunction(
           &InstallPendingConditionalFeatureForModules);
 }
 
 }  // namespace blink