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

chrome/test/chromedriver/session.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/session.h"
 
 #include <list>
 
 #include "base/values.h"
 #include "chrome/test/chromedriver/chrome/chrome.h"
 #include "chrome/test/chromedriver/chrome/status.h"
 #include "chrome/test/chromedriver/chrome/version.h"
 #include "chrome/test/chromedriver/chrome/web_view.h"
 #include "chrome/test/chromedriver/logging.h"
 
 FrameInfo::FrameInfo(const std::string& parent_frame_id,
                      const std::string& frame_id,
                      const std::string& chromedriver_frame_id)
     : parent_frame_id(parent_frame_id),
       frame_id(frame_id),
       chromedriver_frame_id(chromedriver_frame_id) {}
 
-const int Session::kDefaultPageLoadTimeoutMs = 5 * 60 * 1000;
+const base::TimeDelta Session::kDefaultPageLoadTimeout =
+    base::TimeDelta::FromMinutes(5);
 
 Session::Session(const std::string& id)
     : id(id),
       quit(false),
       detach(false),
       sticky_modifiers(0),
       mouse_position(0, 0),
-      page_load_timeout(
-          base::TimeDelta::FromMilliseconds(kDefaultPageLoadTimeoutMs)) {}
+      page_load_timeout(kDefaultPageLoadTimeout) {}
 
 Session::Session(const std::string& id, scoped_ptr<Chrome> chrome)
     : id(id),
       quit(false),
       detach(false),
       chrome(chrome.Pass()),
       sticky_modifiers(0),
       mouse_position(0, 0),
-      page_load_timeout(
-          base::TimeDelta::FromMilliseconds(kDefaultPageLoadTimeoutMs)),
+      page_load_timeout(kDefaultPageLoadTimeout),
       capabilities(CreateCapabilities()) {}
 
 Session::~Session() {}
 
 Status Session::GetTargetWindow(WebView** web_view) {
   if (!chrome)
     return Status(kNoSuchWindow, "no chrome started in this session");
 
   Status status = chrome->GetWebViewById(window, web_view);
   if (status.IsError())
@@ skipping 32 matching lines @@
   caps->SetBoolean("locationContextEnabled", true);
   caps->SetBoolean("applicationCacheEnabled", false);
   caps->SetBoolean("browserConnectionEnabled", false);
   caps->SetBoolean("cssSelectorsEnabled", true);
   caps->SetBoolean("webStorageEnabled", true);
   caps->SetBoolean("rotatable", false);
   caps->SetBoolean("acceptSslCerts", true);
   caps->SetBoolean("nativeEvents", true);
   return caps.Pass();
 }