Remove single observer assumption in WebUSBClient.

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/CallbackPromiseAdapter.h"
 #include "bindings/core/v8/ScriptPromise.h"
 #include "bindings/core/v8/ScriptPromiseResolver.h"
 #include "core/dom/DOMException.h"
@@ skipping 31 matching lines @@
     webFilter->hasSubclassCode = filter.hasSubclassCode();
     if (filter.hasSubclassCode())
         webFilter->subclassCode = filter.subclassCode();
     webFilter->hasProtocolCode = filter.hasProtocolCode();
     if (filter.hasProtocolCode())
         webFilter->protocolCode = filter.protocolCode();
 }
 
 void convertDeviceRequestOptions(const USBDeviceRequestOptions& options, WebUSBDeviceRequestOptions* webOptions)
 {
-    ASSERT(options.hasFilters());
+    DCHECK(options.hasFilters());
     webOptions->filters = WebVector<WebUSBDeviceFilter>(options.filters().size());
     for (size_t i = 0; i < options.filters().size(); ++i) {
         convertDeviceFilter(options.filters()[i], &webOptions->filters[i]);
     }
 }
 
 // Allows using a CallbackPromiseAdapter with a WebVector to resolve the
 // getDevices() promise with a HeapVector owning USBDevices.
 class DeviceArray {
     STATIC_ONLY(DeviceArray);
 public:
     using WebType = OwnPtr<WebVector<WebUSBDevice*>>;
 
     static HeapVector<Member<USBDevice>> take(ScriptPromiseResolver* resolver, PassOwnPtr<WebVector<WebUSBDevice*>> webDevices)
     {
         HeapVector<Member<USBDevice>> devices;
         for (const auto webDevice : *webDevices)
             devices.append(USBDevice::create(adoptPtr(webDevice), resolver->getExecutionContext()));
         return devices;
     }
 };
 
 } // namespace
 
 USB::USB(LocalFrame& frame)
     : LocalFrameLifecycleObserver(&frame)
     , m_client(USBController::from(frame).client())
 {
     if (m_client)
-        m_client->setObserver(this);
+        m_client->addObserver(this);
 }
 
 USB::~USB()
 {
     if (m_client)
-        m_client->setObserver(nullptr);
+        m_client->removeObserver(this);
 }
 
 ScriptPromise USB::getDevices(ScriptState* scriptState)
 {
     if (!m_client)
         return ScriptPromise::rejectWithDOMException(scriptState, DOMException::create(NotSupportedError));
 
     String errorMessage;
     if (!scriptState->getExecutionContext()->isSecureContext(errorMessage))
         return ScriptPromise::rejectWithDOMException(scriptState, DOMException::create(SecurityError, errorMessage));
@@ skipping 33 matching lines @@
 }
 
 const AtomicString& USB::interfaceName() const
 {
     return EventTargetNames::USB;
 }
 
 void USB::willDetachFrameHost()
 {
     if (m_client)
-        m_client->setObserver(nullptr);
+        m_client->removeObserver(this);
     m_client = nullptr;
 }
 
 void USB::onDeviceConnected(WebPassOwnPtr<WebUSBDevice> device)
 {
     dispatchEvent(USBConnectionEvent::create(EventTypeNames::connect, USBDevice::create(device.release(), getExecutionContext())));
 }
 
 void USB::onDeviceDisconnected(WebPassOwnPtr<WebUSBDevice> device)
 {
     dispatchEvent(USBConnectionEvent::create(EventTypeNames::disconnect, USBDevice::create(device.release(), getExecutionContext())));
 }
 
 DEFINE_TRACE(USB)
 {
     RefCountedGarbageCollectedEventTargetWithInlineData<USB>::trace(visitor);
     LocalFrameLifecycleObserver::trace(visitor);
 }
 
 } // namespace blink