Remove MessageLoop destruction observer from //device/usb

device/usb/usb_service.cc

 // 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 "device/usb/usb_service.h"
 
 #include "base/bind.h"
 #include "base/feature_list.h"
 #include "base/location.h"
 #include "base/memory/ptr_util.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "build/build_config.h"
 #include "components/device_event_log/device_event_log.h"
 #include "device/base/features.h"
 #include "device/usb/usb_device.h"
+#include "device/usb/usb_device_handle.h"
 
 #if defined(OS_ANDROID)
 #include "device/usb/usb_service_android.h"
 #elif defined(USE_UDEV)
 #include "device/usb/usb_service_linux.h"
 #else
 #if defined(OS_WIN)
 #include "device/usb/usb_service_win.h"
 #endif
 #include "device/usb/usb_service_impl.h"
@@ skipping 53 matching lines @@
 
 scoped_refptr<UsbDevice> UsbService::GetDevice(const std::string& guid) {
   DCHECK(CalledOnValidThread());
   auto it = devices_.find(guid);
   if (it == devices_.end())
     return nullptr;
   return it->second;
 }
 
 void UsbService::Shutdown() {
+  for (const auto& map_entry : devices_) {
+    // Swap out this list as UsbDevice::HandleClosed() will try to modify it.
+    std::list<UsbDeviceHandle*> handles;
+    handles.swap(map_entry.second->handles());
+    for (auto* handle : handles)
+      handle->Close();
+  }
 #if DCHECK_IS_ON()
   DCHECK(!did_shutdown_);
   did_shutdown_ = true;
 #endif
 }
 
 void UsbService::GetDevices(const GetDevicesCallback& callback) {
   std::vector<scoped_refptr<UsbDevice>> devices;
   devices.reserve(devices_.size());
   for (const auto& map_entry : devices_)
@@ skipping 59 matching lines @@
   DCHECK(CalledOnValidThread());
 
   for (auto& observer : observer_list_)
     observer.OnDeviceRemoved(device);
   device->NotifyDeviceRemoved();
   for (auto& observer : observer_list_)
     observer.OnDeviceRemovedCleanup(device);
 }
 
 }  // namespace device