Blink ServiceRegistry -> InterfaceProvider

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"
 #include "core/dom/ExceptionCode.h"
 #include "device/usb/public/interfaces/device.mojom-blink.h"
 #include "modules/EventTargetModules.h"
 #include "modules/webusb/USBConnectionEvent.h"
 #include "modules/webusb/USBDevice.h"
 #include "modules/webusb/USBDeviceFilter.h"
 #include "modules/webusb/USBDeviceRequestOptions.h"
 #include "platform/UserGestureIndicator.h"
 #include "platform/mojo/MojoHelper.h"
-#include "public/platform/ServiceRegistry.h"
+#include "public/platform/InterfaceProvider.h"
 #include "wtf/Functional.h"
 
 namespace usb = device::usb::blink;
 
 namespace blink {
 namespace {
 
 const char kNoServiceError[] = "USB service unavailable.";
 
 usb::DeviceFilterPtr convertDeviceFilter(const USBDeviceFilter& filter)
@@ skipping 17 matching lines @@
     return mojoFilter;
 }
 
 } // namespace
 
 USB::USB(LocalFrame& frame)
     : ContextLifecycleObserver(frame.document())
     , m_clientBinding(this)
 {
     ThreadState::current()->registerPreFinalizer(this);
-    frame.serviceRegistry()->connectToRemoteService(mojo::GetProxy(&m_deviceManager));
+    frame.interfaceProvider()->getInterface(mojo::GetProxy(&m_deviceManager));
     m_deviceManager.set_connection_error_handler(convertToBaseCallback(WTF::bind(&USB::onDeviceManagerConnectionError, wrapWeakPersistent(this))));
     m_deviceManager->SetClient(m_clientBinding.CreateInterfacePtrAndBind());
 }
 
 USB::~USB()
 {
     // |m_deviceManager| and |m_chooserService| may still be valid but there
     // should be no more outstanding requests to them because each holds a
     // persistent handle to this object.
     DCHECK(m_deviceManagerRequests.isEmpty());
@@ skipping 29 matching lines @@
 {
     ScriptPromiseResolver* resolver = ScriptPromiseResolver::create(scriptState);
     ScriptPromise promise = resolver->promise();
 
     if (!m_chooserService) {
         LocalFrame* frame = getExecutionContext() ? toDocument(getExecutionContext())->frame() : nullptr;
         if (!frame) {
             resolver->reject(DOMException::create(NotSupportedError));
             return promise;
         }
-        frame->serviceRegistry()->connectToRemoteService(mojo::GetProxy(&m_chooserService));
+        frame->interfaceProvider()->getInterface(mojo::GetProxy(&m_chooserService));
         m_chooserService.set_connection_error_handler(convertToBaseCallback(WTF::bind(&USB::onChooserServiceConnectionError, wrapWeakPersistent(this))));
     }
 
     String errorMessage;
     if (!scriptState->getExecutionContext()->isSecureContext(errorMessage)) {
         resolver->reject(DOMException::create(SecurityError, errorMessage));
     } else if (!UserGestureIndicator::consumeUserGesture()) {
         resolver->reject(DOMException::create(SecurityError, "Must be handling a user gesture to show a permission request."));
     } else {
         Vector<usb::DeviceFilterPtr> filters;
@@ skipping 108 matching lines @@
 DEFINE_TRACE(USB)
 {
     EventTargetWithInlineData::trace(visitor);
     ContextLifecycleObserver::trace(visitor);
     visitor->trace(m_deviceManagerRequests);
     visitor->trace(m_chooserServiceRequests);
     visitor->trace(m_deviceCache);
 }
 
 } // namespace blink