diff options
| author | vkuzkokov <vkuzkokov@chromium.org> | 2014-08-25 09:09:03 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-08-25 16:10:22 +0000 |
| commit | 5e3d07bf114469cb2cfe19f234b9ed704c89f6aa (patch) | |
| tree | 096a8a85048892b44f6ddd85ffb5bee82a51abec /chrome/browser/devtools/device/adb/adb_client_socket.h | |
| parent | 31d566a65d3d80bc4261567494d970c1ecfb8b2c (diff) | |
| download | chromium_src-5e3d07bf114469cb2cfe19f234b9ed704c89f6aa.zip chromium_src-5e3d07bf114469cb2cfe19f234b9ed704c89f6aa.tar.gz chromium_src-5e3d07bf114469cb2cfe19f234b9ed704c89f6aa.tar.bz2 | |
Revert of DevTools: Removed refcounting from AndroidWebSocket (patchset #12 of https://codereview.chromium.org/449883002/)
Reason for revert:
There is a crash when port forwarding is turned off while there is at least one connected device.
BUG=407137
Original issue's description:
> DevTools: Removed refcounting from AndroidWebSocket
>
> Issue 387067 can be resolved by having port forwarding socket dependent on all other references to AndroidDeviceManager::Device.
>
> This requires for lifetime of AWS to be manageable in the first place.
>
> BUG=387067
>
> Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=289306
Review URL: https://codereview.chromium.org/505783002
Cr-Commit-Position: refs/heads/master@{#291690}
Diffstat (limited to 'chrome/browser/devtools/device/adb/adb_client_socket.h')
| -rw-r--r-- | chrome/browser/devtools/device/adb/adb_client_socket.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/devtools/device/adb/adb_client_socket.h b/chrome/browser/devtools/device/adb/adb_client_socket.h index f331b02..f0d26ad 100644 --- a/chrome/browser/devtools/device/adb/adb_client_socket.h +++ b/chrome/browser/devtools/device/adb/adb_client_socket.h @@ -13,7 +13,7 @@ class AdbClientSocket { public: typedef base::Callback<void(int, const std::string&)> CommandCallback; typedef base::Callback<void(int result, - scoped_ptr<net::StreamSocket>)> SocketCallback; + net::StreamSocket*)> SocketCallback; static void AdbQuery(int port, const std::string& query, |