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

chrome/test/chromedriver/performance_logger.cc

 // Copyright 2014 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/performance_logger.h"
 
 #include <string>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/json/json_writer.h"
 #include "base/strings/string_util.h"
 #include "base/values.h"
 #include "chrome/test/chromedriver/chrome/browser_info.h"
 #include "chrome/test/chromedriver/chrome/chrome.h"
 #include "chrome/test/chromedriver/chrome/devtools_client.h"
 #include "chrome/test/chromedriver/chrome/devtools_client_impl.h"
 #include "chrome/test/chromedriver/chrome/log.h"
 #include "chrome/test/chromedriver/chrome/status.h"
 #include "chrome/test/chromedriver/session.h"
+#include "chrome/test/chromedriver/util.h"
 
 namespace {
 
 // DevTools event domain prefixes to intercept.
 const char* const kDomains[] = {"Network.", "Page.", "Timeline."};
 
 // Whitelist of WebDriver commands on which to request buffered trace events.
 const char* const kRequestTraceCommands[] = {"GetLog" /* required */,
     "Navigate"};
 
@@ skipping 230 matching lines @@
   else
     status = browser_client_->SendAsyncCommand("Tracing.end", params);
   if (status.IsError()) {
     LOG(ERROR) << "error when stopping trace: " << status.message();
     return status;
   }
 
   // Block up to 30 seconds until Tracing.tracingComplete event is received.
   status = browser_client_->HandleEventsUntil(
       base::Bind(&PerformanceLogger::IsTraceDone, base::Unretained(this)),
-      base::TimeDelta::FromSeconds(30));
+      Timeout(base::TimeDelta::FromSeconds(30)));
   if (status.IsError())
     return status;
 
   return StartTrace();
 }
 
 Status PerformanceLogger::IsTraceDone(bool* trace_done) const {
   *trace_done = !trace_buffering_;
   return Status(kOk);
 }