DevTools: do not retain android_usb_devices in their manager.

chrome/browser/devtools/android_device.cc

 // Copyright 2013 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 "chrome/browser/devtools/android_device.h"
 
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/threading/thread.h"
@@ skipping 90 matching lines @@
 UsbDeviceImpl::UsbDeviceImpl(AndroidUsbDevice* device)
     : Device(device->serial(), device->is_connected()),
       device_(device) {
   device_->InitOnCallerThread();
 }
 
 void UsbDeviceImpl::RunCommand(const std::string& command,
                                const CommandCallback& callback) {
   DCHECK(CalledOnValidThread());
   net::StreamSocket* socket = device_->CreateSocket(command);
+  if (!socket) {
+    callback.Run(net::ERR_CONNECTION_FAILED, std::string());
+    return;
+  }
   int result = socket->Connect(base::Bind(&UsbDeviceImpl::OpenedForCommand,
                                           this, callback, socket));
   if (result != net::ERR_IO_PENDING)
     callback.Run(result, std::string());
 }
 
 void UsbDeviceImpl::OpenSocket(const std::string& name,
                                const SocketCallback& callback) {
   DCHECK(CalledOnValidThread());
   std::string socket_name =
       base::StringPrintf(kLocalAbstractCommand, name.c_str());
   net::StreamSocket* socket = device_->CreateSocket(socket_name);
+  if (!socket) {
+    callback.Run(net::ERR_CONNECTION_FAILED, NULL);
+    return;
+  }
   int result = socket->Connect(base::Bind(&UsbDeviceImpl::OnOpenSocket, this,
                                           callback, socket));
   if (result != net::ERR_IO_PENDING)
     callback.Run(result, NULL);
 }
 
 void UsbDeviceImpl::OnOpenSocket(const SocketCallback& callback,
                   net::StreamSocket* socket,
                   int result) {
   callback.Run(result, result == net::OK ? socket : NULL);
@@ skipping 388 matching lines @@
 }
 
 AndroidDeviceManager::Device*
 AndroidDeviceManager::FindDevice(const std::string& serial) {
   DCHECK(CalledOnValidThread());
   DeviceMap::const_iterator it = devices_.find(serial);
   if (it == devices_.end())
     return NULL;
   return (*it).second.get();
 }