Make the navigator.usb attribute accessible only in secure contexts.

third_party/WebKit/Source/modules/webusb/USB.cpp

 // Copyright 2015 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 "modules/webusb/USB.h"
 
 #include "bindings/core/v8/ScriptPromise.h"
 #include "bindings/core/v8/ScriptPromiseResolver.h"
 #include "core/dom/DOMException.h"
 #include "core/dom/Document.h"
@@ skipping 62 matching lines @@
   // prevent messages from being dispatched before lazy sweeping.
   m_clientBinding.Close();
 }
 
 ScriptPromise USB::getDevices(ScriptState* scriptState) {
   ScriptPromiseResolver* resolver = ScriptPromiseResolver::create(scriptState);
   ScriptPromise promise = resolver->promise();
   if (!m_deviceManager) {
     resolver->reject(DOMException::create(NotSupportedError));
   } else {
-    String errorMessage;
-    if (!scriptState->getExecutionContext()->isSecureContext(errorMessage)) {
-      resolver->reject(DOMException::create(SecurityError, errorMessage));
-    } else {
-      m_deviceManagerRequests.insert(resolver);
-      m_deviceManager->GetDevices(
-          nullptr, convertToBaseCallback(WTF::bind(&USB::onGetDevices,
-                                                   wrapPersistent(this),
-                                                   wrapPersistent(resolver))));
-    }
+    m_deviceManagerRequests.insert(resolver);
+    m_deviceManager->GetDevices(
+        nullptr, convertToBaseCallback(WTF::bind(&USB::onGetDevices,
+                                                 wrapPersistent(this),
+                                                 wrapPersistent(resolver))));
   }
   return promise;
 }
 
 ScriptPromise USB::requestDevice(ScriptState* scriptState,
                                  const USBDeviceRequestOptions& options) {
   ExecutionContext* executionContext = scriptState->getExecutionContext();
 
   ScriptPromiseResolver* resolver = ScriptPromiseResolver::create(scriptState);
   ScriptPromise promise = resolver->promise();
 
   if (!m_chooserService) {
     LocalFrame* frame = executionContext->isDocument()
                             ? toDocument(executionContext)->frame()
                             : nullptr;
     if (!frame) {
       resolver->reject(DOMException::create(NotSupportedError));
       return promise;
     }
     frame->interfaceProvider()->getInterface(
         mojo::MakeRequest(&m_chooserService));
     m_chooserService.set_connection_error_handler(
         convertToBaseCallback(WTF::bind(&USB::onChooserServiceConnectionError,
                                         wrapWeakPersistent(this))));
   }
 
-  String errorMessage;
-  if (!executionContext->isSecureContext(errorMessage)) {
-    resolver->reject(DOMException::create(SecurityError, errorMessage));
-  } else if (!UserGestureIndicator::consumeUserGesture()) {
+  if (!UserGestureIndicator::consumeUserGesture()) {
     resolver->reject(DOMException::create(
         SecurityError,
         "Must be handling a user gesture to show a permission request."));
   } else {
     Vector<usb::DeviceFilterPtr> filters;
     if (options.hasFilters()) {
       filters.reserveCapacity(options.filters().size());
       for (const auto& filter : options.filters())
         filters.push_back(convertDeviceFilter(filter));
     }
@@ skipping 101 matching lines @@
 
 DEFINE_TRACE(USB) {
   visitor->trace(m_deviceManagerRequests);
   visitor->trace(m_chooserServiceRequests);
   visitor->trace(m_deviceCache);
   EventTargetWithInlineData::trace(visitor);
   ContextLifecycleObserver::trace(visitor);
 }
 
 }  // namespace blink