[chromedriver] Improve timeout behavior. Prompted by user who executes script on busy page.

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 54 matching lines @@
   bool success = false;
   base::WaitableEvent event(false, false);
   context_getter_->GetNetworkTaskRunner()->PostTask(
       FROM_HERE,
       base::Bind(&SyncWebSocketImpl::Core::SendOnIO,
                  this, message, &success, &event));
   event.Wait();
   return success;
 }
 
-SyncWebSocket::StatusCode
-SyncWebSocketImpl::Core::ReceiveNextMessage(
+SyncWebSocket::StatusCode SyncWebSocketImpl::Core::ReceiveNextMessage(
     std::string* message,
     const base::TimeDelta& timeout) {
   base::AutoLock lock(lock_);
   base::TimeTicks deadline = base::TimeTicks::Now() + timeout;
+  base::TimeDelta next_wait = timeout;
   while (received_queue_.empty() && is_connected_) {
-    base::TimeDelta delta = deadline - base::TimeTicks::Now();
-    if (delta <= base::TimeDelta())
+    if (next_wait <= base::TimeDelta())
       return SyncWebSocket::kTimeout;
-    on_update_event_.TimedWait(delta);
+    on_update_event_.TimedWait(next_wait);
+    next_wait = deadline - base::TimeTicks::Now();
   }
   if (!is_connected_)
     return SyncWebSocket::kDisconnected;
   *message = received_queue_.front();
   received_queue_.pop_front();
   return SyncWebSocket::kOk;
 }
 
 bool SyncWebSocketImpl::Core::HasNextMessage() {
   base::AutoLock lock(lock_);
@@ skipping 49 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);
 }