DevTools: Partially redesigned DevToolsAndroidBridge and AndroidDeviceManager

chrome/browser/devtools/device/android_device_manager.cc

Index: chrome/browser/devtools/device/android_device_manager.cc
diff --git a/chrome/browser/devtools/device/android_device_manager.cc b/chrome/browser/devtools/device/android_device_manager.cc
index d4b31c92f9b5a1b11071575f6bf6bd59ccec3694..c86067432dbe9aac9465128136892c3c51326dc1 100644
--- a/chrome/browser/devtools/device/android_device_manager.cc
+++ b/chrome/browser/devtools/device/android_device_manager.cc
@@ -200,15 +200,13 @@ void AndroidDeviceManager::QueryDevices(
     const DeviceProviders& providers,
     const QueryDevicesCallback& callback) {
   DCHECK(CalledOnValidThread());
-  stopped_ = false;
   Devices empty;
   QueryNextProvider(callback, providers, empty, empty);
 }
 
-void AndroidDeviceManager::Stop() {
+void AndroidDeviceManager::ReleaseDevice(const std::string& serial) {
   DCHECK(CalledOnValidThread());
-  stopped_ = true;
-  devices_.clear();
+  devices_.erase(serial);
 }
 
 bool AndroidDeviceManager::IsConnected(const std::string& serial) {
@@ -273,8 +271,7 @@ void AndroidDeviceManager::HttpUpgrade(
   }
 }
 
-AndroidDeviceManager::AndroidDeviceManager()
-    : stopped_(false) {
+AndroidDeviceManager::AndroidDeviceManager() {
 }
 
 AndroidDeviceManager::~AndroidDeviceManager() {
@@ -287,9 +284,6 @@ void AndroidDeviceManager::QueryNextProvider(
     const Devices& new_devices) {
   DCHECK(CalledOnValidThread());
 
-  if (stopped_)

[Vladislav Kaznacheev, 2014/05/19 10:32:11]

I doubt that you could just remove this. This check solved a real problem. If
the callback is called after the last listener's removal then the manager
retains the device indefinitely. 

[vkuzkokov, 2014/05/20 12:34:29]

Devices are freed because DeviceHandle will be destroyed after DiscoveryRequest
is finished.

-    return;
-
   Devices more_devices(total_devices);
   more_devices.insert(
       more_devices.end(), new_devices.begin(), new_devices.end());