DevTools: Merged AndroidWebSocket and AndroidWebSocketImpl

DevTools: Merged AndroidWebSocket and AndroidWebSocketImpl

This is done so that ADM::Device could have access to AndroidWebSocket's private members in order to close all sockets when device is released.

BUG=387067
Committed: https://crrev.com/6b4bf550bad72f91ab917bc201c72d92047d5ee6
Cr-Commit-Position: refs/heads/master@{#300663}

[vkuzkokov, 2014-10-02 17:05:30]

vkuzkokov@chromium.org changed reviewers:
+ dgozman@chromium.org

[vkuzkokov, 2014-10-03 15:10:12]

Patchset #3 (id:40001) has been deleted

[vkuzkokov, 2014-10-03 15:10:20]

Patchset #2 (id:20001) has been deleted

[vkuzkokov, 2014-10-03 15:16:52]

Patchset #1 (id:1) has been deleted

[vkuzkokov, 2014-10-03 15:21:39]

Uploaded diff with just methods reordering so that other changes become more
evident.

[dgozman, 2014-10-03 19:25:17]

Please provide incentive for this in patch description.

https://codereview.chromium.org/620183002/diff/80001/chrome/browser/devtools/...
File chrome/browser/devtools/device/android_web_socket.cc (right):

https://codereview.chromium.org/620183002/diff/80001/chrome/browser/devtools/...
chrome/browser/devtools/device/android_web_socket.cc:137: weak_factory_(this) {
socket_impl_(nullptr)

https://codereview.chromium.org/620183002/diff/80001/chrome/browser/devtools/...
chrome/browser/devtools/device/android_web_socket.cc:147:
device_->device_message_loop_->DeleteSoon(FROM_HERE, socket_impl_);
if (socket_impl_)
  ...

https://codereview.chromium.org/620183002/diff/80001/chrome/browser/devtools/...
chrome/browser/devtools/device/android_web_socket.cc:153:
device_->device_message_loop_->PostTask(
DCHECK(socket_impl_)

https://codereview.chromium.org/620183002/diff/80001/chrome/browser/devtools/...
chrome/browser/devtools/device/android_web_socket.cc:189:
AndroidDeviceManager::Device::CreateWebSocket(
What if you make AndroidWebSocket::Create(device, socket, url, delegate) method?
You can probably remove all the friends then.

[vkuzkokov, 2014-10-06 14:31:11]

Patchset #4 (id:120001) has been deleted

[vkuzkokov, 2014-10-06 14:31:44]

https://codereview.chromium.org/620183002/diff/80001/chrome/browser/devtools/...
File chrome/browser/devtools/device/android_web_socket.cc (right):

https://codereview.chromium.org/620183002/diff/80001/chrome/browser/devtools/...
chrome/browser/devtools/device/android_web_socket.cc:137: weak_factory_(this) {
On 2014/10/03 19:25:17, dgozman wrote:
> socket_impl_(nullptr)

Done.

https://codereview.chromium.org/620183002/diff/80001/chrome/browser/devtools/...
chrome/browser/devtools/device/android_web_socket.cc:147:
device_->device_message_loop_->DeleteSoon(FROM_HERE, socket_impl_);
On 2014/10/03 19:25:16, dgozman wrote:
> if (socket_impl_)
>   ...

Done.

https://codereview.chromium.org/620183002/diff/80001/chrome/browser/devtools/...
chrome/browser/devtools/device/android_web_socket.cc:153:
device_->device_message_loop_->PostTask(
On 2014/10/03 19:25:17, dgozman wrote:
> DCHECK(socket_impl_)

Done.

https://codereview.chromium.org/620183002/diff/80001/chrome/browser/devtools/...
chrome/browser/devtools/device/android_web_socket.cc:189:
AndroidDeviceManager::Device::CreateWebSocket(
On 2014/10/03 19:25:17, dgozman wrote:
> What if you make AndroidWebSocket::Create(device, socket, url, delegate)
method?
> You can probably remove all the friends then.

Friend declarations will still be needed, especially when device will close all
its sockets and sockets will register with device.

[vkuzkokov, 2014-10-08 14:04:47]

Patchset #4 (id:140001) has been deleted

[dgozman, 2014-10-21 16:29:35]

lgtm

https://codereview.chromium.org/620183002/diff/160001/chrome/browser/devtools...
File chrome/browser/devtools/device/android_device_manager.h (right):

https://codereview.chromium.org/620183002/diff/160001/chrome/browser/devtools...
chrome/browser/devtools/device/android_device_manager.h:88: std::string url_;
Is this used anywhere?

https://codereview.chromium.org/620183002/diff/160001/chrome/browser/devtools...
File chrome/browser/devtools/device/android_web_socket.cc (right):

https://codereview.chromium.org/620183002/diff/160001/chrome/browser/devtools...
chrome/browser/devtools/device/android_web_socket.cc:38: Read(new
net::IOBuffer(kBufferSize));
Let's explicitly construct scoped_refptr.

https://codereview.chromium.org/620183002/diff/160001/chrome/browser/devtools...
chrome/browser/devtools/device/android_web_socket.cc:166: if (result != net::OK
|| !socket) {
!socket.get()

[vkuzkokov, 2014-10-21 16:48:35]

https://codereview.chromium.org/620183002/diff/160001/chrome/browser/devtools...
File chrome/browser/devtools/device/android_device_manager.h (right):

https://codereview.chromium.org/620183002/diff/160001/chrome/browser/devtools...
chrome/browser/devtools/device/android_device_manager.h:88: std::string url_;
On 2014/10/21 16:29:34, dgozman wrote:
> Is this used anywhere?

Not really. Removed.

https://codereview.chromium.org/620183002/diff/160001/chrome/browser/devtools...
File chrome/browser/devtools/device/android_web_socket.cc (right):

https://codereview.chromium.org/620183002/diff/160001/chrome/browser/devtools...
chrome/browser/devtools/device/android_web_socket.cc:38: Read(new
net::IOBuffer(kBufferSize));
On 2014/10/21 16:29:34, dgozman wrote:
> Let's explicitly construct scoped_refptr.

Done.

https://codereview.chromium.org/620183002/diff/160001/chrome/browser/devtools...
chrome/browser/devtools/device/android_web_socket.cc:166: if (result != net::OK
|| !socket) {
On 2014/10/21 16:29:34, dgozman wrote:
> !socket.get()

Done.

[vkuzkokov, 2014-10-21 16:50:30]

The CQ bit was checked by vkuzkokov@chromium.org

[commit-bot: I haz the power, 2014-10-21 16:52:48]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/620183002/200001

[commit-bot: I haz the power, 2014-10-21 18:01:47]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-10-21 18:01:48]

Try jobs failed on following builders:
  linux_chromium_rel_swarming on tryserver.chromium.linux
(http://build.chromium.org/p/tryserver.chromium.linux/builders/linux_chromium_...)

[vkuzkokov, 2014-10-22 10:41:39]

The CQ bit was checked by vkuzkokov@chromium.org

[commit-bot: I haz the power, 2014-10-22 10:41:53]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/620183002/200001

[commit-bot: I haz the power, 2014-10-22 11:05:21]

Committed patchset #6 (id:200001)

[commit-bot: I haz the power, 2014-10-22 11:06:27]

Patchset 6 (id:??) landed as
https://crrev.com/6b4bf550bad72f91ab917bc201c72d92047d5ee6
Cr-Commit-Position: refs/heads/master@{#300663}