[chromedriver] Apply page load timeout to slow cross-process navigations

chrome/test/chromedriver/net/sync_websocket_impl_unittest.cc

Index: chrome/test/chromedriver/net/sync_websocket_impl_unittest.cc
diff --git a/chrome/test/chromedriver/net/sync_websocket_impl_unittest.cc b/chrome/test/chromedriver/net/sync_websocket_impl_unittest.cc
index b7d27b575b617c883b56eb264a285b406afde1f2..47372908f314c795a64f1c9814b9453d61bb1fb8 100644
--- a/chrome/test/chromedriver/net/sync_websocket_impl_unittest.cc
+++ b/chrome/test/chromedriver/net/sync_websocket_impl_unittest.cc
@@ -13,6 +13,7 @@
 #include "base/time/time.h"
 #include "chrome/test/chromedriver/net/sync_websocket_impl.h"
 #include "chrome/test/chromedriver/net/test_http_server.h"
+#include "chrome/test/chromedriver/net/timeout.h"
 #include "chrome/test/chromedriver/net/url_request_context_getter.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "url/gurl.h"
@@ -35,6 +36,8 @@ class SyncWebSocketImplTest : public testing::Test {
 
   void TearDown() override { server_.Stop(); }
 
+  Timeout long_timeout() const { return Timeout(long_timeout_); }
+
   base::Thread client_thread_;
   TestHttpServer server_;
   scoped_refptr<URLRequestContextGetter> context_getter_;
@@ -64,7 +67,7 @@ TEST_F(SyncWebSocketImplTest, SendReceive) {
   std::string message;
   ASSERT_EQ(
       SyncWebSocket::kOk,
-      sock.ReceiveNextMessage(&message, long_timeout_));
+      sock.ReceiveNextMessage(&message, long_timeout()));
   ASSERT_STREQ("hi", message.c_str());
 }
 
@@ -76,7 +79,7 @@ TEST_F(SyncWebSocketImplTest, SendReceiveTimeout) {
   ASSERT_EQ(
       SyncWebSocket::kTimeout,
       sock.ReceiveNextMessage(
-          &message, base::TimeDelta()));
+          &message, Timeout(base::TimeDelta())));

[samuong, 2016/04/13 03:59:30]

this conflicts with one of your older cls, so you'll need to rebase and fix this

[Alexander Semashko, 2016/04/13 15:51:35]

Done.

 }
 
 TEST_F(SyncWebSocketImplTest, SendReceiveLarge) {
@@ -87,7 +90,7 @@ TEST_F(SyncWebSocketImplTest, SendReceiveLarge) {
   std::string message;
   ASSERT_EQ(
       SyncWebSocket::kOk,
-      sock.ReceiveNextMessage(&message, long_timeout_));
+      sock.ReceiveNextMessage(&message, long_timeout()));
   ASSERT_EQ(wrote_message.length(), message.length());
   ASSERT_EQ(wrote_message, message);
 }
@@ -100,16 +103,16 @@ TEST_F(SyncWebSocketImplTest, SendReceiveMany) {
   std::string message;
   ASSERT_EQ(
       SyncWebSocket::kOk,
-      sock.ReceiveNextMessage(&message, long_timeout_));
+      sock.ReceiveNextMessage(&message, long_timeout()));
   ASSERT_STREQ("1", message.c_str());
   ASSERT_TRUE(sock.Send("3"));
   ASSERT_EQ(
       SyncWebSocket::kOk,
-      sock.ReceiveNextMessage(&message, long_timeout_));
+      sock.ReceiveNextMessage(&message, long_timeout()));
   ASSERT_STREQ("2", message.c_str());
   ASSERT_EQ(
       SyncWebSocket::kOk,
-      sock.ReceiveNextMessage(&message, long_timeout_));
+      sock.ReceiveNextMessage(&message, long_timeout()));
   ASSERT_STREQ("3", message.c_str());
 }
 
@@ -121,7 +124,7 @@ TEST_F(SyncWebSocketImplTest, CloseOnReceive) {
   std::string message;
   ASSERT_EQ(
       SyncWebSocket::kDisconnected,
-      sock.ReceiveNextMessage(&message, long_timeout_));
+      sock.ReceiveNextMessage(&message, long_timeout()));
   ASSERT_STREQ("", message.c_str());
 }
 
@@ -137,9 +140,8 @@ TEST_F(SyncWebSocketImplTest, Reconnect) {
   ASSERT_TRUE(sock.Connect(server_.web_socket_url()));
   ASSERT_TRUE(sock.Send("1"));
   // Wait for SyncWebSocket to receive the response from the server.
-  base::TimeTicks deadline =
-      base::TimeTicks::Now() + base::TimeDelta::FromSeconds(20);
-  while (base::TimeTicks::Now() < deadline) {
+  Timeout response_timeout(base::TimeDelta::FromSeconds(20));
+  while (!response_timeout.IsExpired()) {
     if (sock.IsConnected() && !sock.HasNextMessage())
       base::PlatformThread::Sleep(base::TimeDelta::FromMilliseconds(10));
     else
@@ -156,7 +158,7 @@ TEST_F(SyncWebSocketImplTest, Reconnect) {
   std::string message;
   ASSERT_EQ(
       SyncWebSocket::kOk,
-      sock.ReceiveNextMessage(&message, long_timeout_));
+      sock.ReceiveNextMessage(&message, long_timeout()));
   ASSERT_STREQ("3", message.c_str());
   ASSERT_FALSE(sock.HasNextMessage());
 }