diff options
| author | vkuzkokov@chromium.org <vkuzkokov@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-16 13:49:48 +0000 |
|---|---|---|
| committer | vkuzkokov@chromium.org <vkuzkokov@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-16 13:49:48 +0000 |
| commit | b6dded72b68716b360f84d4273f14de00e36dfb9 (patch) | |
| tree | 5cdbb36f7731b98975e1578f081eb58941211b52 /chrome/browser/devtools | |
| parent | a61744215264837234ae39e47aaf454b67a08f30 (diff) | |
| download | chromium_src-b6dded72b68716b360f84d4273f14de00e36dfb9.zip chromium_src-b6dded72b68716b360f84d4273f14de00e36dfb9.tar.gz chromium_src-b6dded72b68716b360f84d4273f14de00e36dfb9.tar.bz2 | |
DevTools: Fixed AndroidDeviceManager destruction
BUG=372564
Review URL: https://codereview.chromium.org/287003006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@271008 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/devtools')
| -rw-r--r-- | chrome/browser/devtools/device/devtools_android_bridge.cc | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/chrome/browser/devtools/device/devtools_android_bridge.cc b/chrome/browser/devtools/device/devtools_android_bridge.cc index 5fefecc..b6ec8cc 100644 --- a/chrome/browser/devtools/device/devtools_android_bridge.cc +++ b/chrome/browser/devtools/device/devtools_android_bridge.cc @@ -1259,9 +1259,12 @@ DevToolsAndroidBridge::~DevToolsAndroidBridge() { DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); DCHECK(device_list_listeners_.empty()); DCHECK(device_count_listeners_.empty()); - if (device_manager_) - device_message_loop()->PostTask(FROM_HERE, - base::Bind(&AndroidDeviceManager::Stop, device_manager_)); + if (device_manager_) { + AndroidDeviceManager* raw_ptr = device_manager_.get(); + device_manager_->AddRef(); + device_manager_ = NULL; + device_message_loop()->ReleaseSoon(FROM_HERE, raw_ptr); + } } void DevToolsAndroidBridge::RequestDeviceList() { |