[chromedriver] Implement reconnection to DevTools.

chrome/test/chromedriver/net/sync_websocket_impl.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/test/chromedriver/net/sync_websocket_impl.h"
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/location.h"
 #include "base/single_thread_task_runner.h"
@@ skipping 19 matching lines @@
 bool SyncWebSocketImpl::ReceiveNextMessage(std::string* message) {
   return core_->ReceiveNextMessage(message);
 }
 
 bool SyncWebSocketImpl::HasNextMessage() {
   return core_->HasNextMessage();
 }
 
 SyncWebSocketImpl::Core::Core(net::URLRequestContextGetter* context_getter)
     : context_getter_(context_getter),
-      closed_(false),
+      closed_(true),

[kkania, 2013/02/22 01:35:24]

if you're going to have closed_ = true on start, you should change the name to
open_ instead, and default it to false. it's not normal to say that a socket is
closed if it has never been opened in the first place

[chrisgao (Use stgao instead), 2013/02/27 19:29:44]

Done.

       on_update_event_(&lock_) {}
 
 bool SyncWebSocketImpl::Core::Connect(const GURL& url) {
   bool success = false;
   base::WaitableEvent event(false, false);
   context_getter_->GetNetworkTaskRunner()->PostTask(
       FROM_HERE,
       base::Bind(&SyncWebSocketImpl::Core::ConnectOnIO,
                  this, url, &success, &event));
   event.Wait();
+  if (success) {
+    base::AutoLock lock(lock_);
+    closed_ = false;

[kkania, 2013/02/22 01:35:24]

i think this is a race; the socket could have been closed quickly right before
this, and we'd think it was open.

[chrisgao (Use stgao instead), 2013/02/27 19:29:44]

As Core::OnConnectCompletedOnIO and Core::OnClose can be called asynchronously,
added an enum for state: disconnected, connecting, and connected.

+  }
   return success;
 }
 
 bool SyncWebSocketImpl::Core::Send(const std::string& message) {
   bool success = false;
   base::WaitableEvent event(false, false);
   context_getter_->GetNetworkTaskRunner()->PostTask(
       FROM_HERE,
       base::Bind(&SyncWebSocketImpl::Core::SendOnIO,
                  this, message, &success, &event));
@@ skipping 27 matching lines @@
   closed_ = true;
   on_update_event_.Signal();
 }
 
 SyncWebSocketImpl::Core::~Core() { }
 
 void SyncWebSocketImpl::Core::ConnectOnIO(
     const GURL& url,
     bool* success,
     base::WaitableEvent* event) {
+  base::AutoLock lock(lock_);
+  received_queue_.clear();
   socket_.reset(new WebSocket(context_getter_, url, this));
   socket_->Connect(base::Bind(
       &SyncWebSocketImpl::Core::OnConnectCompletedOnIO,
       this, success, event));
 }
 
 void SyncWebSocketImpl::Core::OnConnectCompletedOnIO(
     bool* success,
     base::WaitableEvent* event,
     int error) {
@@ skipping 10 matching lines @@
 }
 
 void SyncWebSocketImpl::Core::OnDestruct() const {
   scoped_refptr<base::SingleThreadTaskRunner> network_task_runner =
       context_getter_->GetNetworkTaskRunner();
   if (network_task_runner->BelongsToCurrentThread())
     delete this;
   else
     network_task_runner->DeleteSoon(FROM_HERE, this);
 }