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

chrome/test/chromedriver/session_commands.cc

 // Copyright (c) 2013 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_commands.h"
 
 #include <list>
 
 #include "base/bind.h"
 #include "base/callback.h"
@@ skipping 204 matching lines @@
   base::TimeDelta timeout =
       base::TimeDelta::FromMilliseconds(static_cast<int>(ms_double));
   // TODO(frankf): implicit and script timeout should be cleared
   // if negative timeout is specified.
   if (type == "implicit") {
     session->implicit_wait = timeout;
   } else if (type == "script") {
     session->script_timeout = timeout;
   } else if (type == "page load") {
     session->page_load_timeout =
-        ((timeout < base::TimeDelta()) ? base::TimeDelta::FromMilliseconds(
-                                             Session::kDefaultPageLoadTimeoutMs)
+        ((timeout < base::TimeDelta()) ? Session::kDefaultPageLoadTimeout
                                        : timeout);
   } else {
     return Status(kUnknownError, "unknown type of timeout:" + type);
   }
   return Status(kOk);
 }
 
 Status ExecuteSetScriptTimeout(
     Session* session,
     const base::DictionaryValue& params,
@@ skipping 201 matching lines @@
   }
   std::string error_msg;
   base::FilePath upload;
   Status status = UnzipSoleFile(upload_dir, zip_data, &upload);
   if (status.IsError())
     return Status(kUnknownError, "unable to unzip 'file'", status);
 
   value->reset(new base::StringValue(upload.value()));
   return Status(kOk);
 }