diff options
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/browser/devtools/device/devtools_android_bridge.cc | 9 | ||||
| -rw-r--r-- | chrome/browser/ui/webui/inspect_ui_browsertest.cc | 2 |
2 files changed, 7 insertions, 4 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() { diff --git a/chrome/browser/ui/webui/inspect_ui_browsertest.cc b/chrome/browser/ui/webui/inspect_ui_browsertest.cc index ee6a6f9..e9d9683 100644 --- a/chrome/browser/ui/webui/inspect_ui_browsertest.cc +++ b/chrome/browser/ui/webui/inspect_ui_browsertest.cc @@ -45,7 +45,7 @@ IN_PROC_BROWSER_TEST_F(InspectUITest, InspectUIPage) { new base::StringValue(chrome::kChromeUIInspectURL))); } -IN_PROC_BROWSER_TEST_F(InspectUITest, DISABLED_SharedWorker) { +IN_PROC_BROWSER_TEST_F(InspectUITest, SharedWorker) { ASSERT_TRUE(test_server()->Start()); GURL url = test_server()->GetURL(kSharedWorkerTestPage); ui_test_utils::NavigateToURL(browser(), url); |