"Fix" remaining connection error handlers in Blink

third_party/WebKit/Source/modules/webusb/USBDevice.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/USBDevice.h"
 
 #include "bindings/core/v8/ScriptPromise.h"
 #include "bindings/core/v8/ScriptPromiseResolver.h"
 #include "bindings/core/v8/ToV8.h"
 #include "core/dom/DOMArrayBuffer.h"
 #include "core/dom/DOMArrayBufferView.h"
 #include "core/dom/DOMException.h"
 #include "core/dom/ExceptionCode.h"
 #include "core/frame/UseCounter.h"
 #include "modules/webusb/USBConfiguration.h"
 #include "modules/webusb/USBControlTransferParameters.h"
 #include "modules/webusb/USBInTransferResult.h"
 #include "modules/webusb/USBIsochronousInTransferResult.h"
 #include "modules/webusb/USBIsochronousOutTransferResult.h"
 #include "modules/webusb/USBOutTransferResult.h"
 #include "platform/mojo/MojoHelper.h"
+#include "public/platform/Platform.h"
 #include "wtf/Assertions.h"
 
 namespace usb = device::usb::blink;
 
 namespace blink {
 
 namespace {
 
 const char kDeviceStateChangeInProgress[] =
     "An operation that changes the device state is in progress.";
@@ skipping 63 matching lines @@
 
 USBDevice::USBDevice(usb::DeviceInfoPtr deviceInfo,
                      usb::DevicePtr device,
                      ExecutionContext* context)
     : ContextLifecycleObserver(context),
       m_deviceInfo(std::move(deviceInfo)),
       m_device(std::move(device)),
       m_opened(false),
       m_deviceStateChangeInProgress(false),
       m_configurationIndex(-1) {
-  if (m_device)
+  if (m_device) {
     m_device.set_connection_error_handler(convertToBaseCallback(
         WTF::bind(&USBDevice::onConnectionError, wrapWeakPersistent(this))));
+  }
   int configurationIndex = findConfigurationIndex(info().active_configuration);
   if (configurationIndex != -1)
     onConfigurationSelected(true /* success */, configurationIndex);
 }
 
 USBDevice::~USBDevice() {
   // |m_device| may still be valid but there should be no more outstanding
   // requests because each holds a persistent handle to this object.
   DCHECK(m_deviceRequests.isEmpty());
 }
@@ skipping 812 matching lines @@
     return;
 
   if (success)
     resolver->resolve();
   else
     resolver->reject(
         DOMException::create(NetworkError, "Unable to reset the device."));
 }
 
 void USBDevice::onConnectionError() {
+  if (!Platform::current()) {
+    // TODO(rockot): Clean this up once renderer shutdown sequence is fixed.
+    return;
+  }
+
   m_device.reset();
   m_opened = false;
   for (ScriptPromiseResolver* resolver : m_deviceRequests)
     resolver->reject(DOMException::create(NotFoundError, kDeviceUnavailable));
   m_deviceRequests.clear();
 }
 
 bool USBDevice::markRequestComplete(ScriptPromiseResolver* resolver) {
   auto requestEntry = m_deviceRequests.find(resolver);
   if (requestEntry == m_deviceRequests.end())
     return false;
   m_deviceRequests.remove(requestEntry);
   return true;
 }
 
 }  // namespace blink