Fixing InProcBrowserTestTimeout for P13N

chrome/test/in_process_browser_test.cc

 // Copyright (c) 2006-2008 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/in_process_browser_test.h"
 
 #include "base/command_line.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
@@ skipping 15 matching lines @@
 #include "chrome/common/main_function_params.h"
 #include "chrome/test/testing_browser_process.h"
 #include "chrome/test/ui_test_utils.h"
 #include "net/base/host_resolver_unittest.h"
 #include "sandbox/src/dep.h"
 
 extern int BrowserMain(const MainFunctionParams&);
 
 const wchar_t kUnitTestShowWindows[] = L"show-windows";
 
-// Delay for the time-out at which we stop the inner-message loop the first
-// time.
+// Default delay for the time-out at which we stop the
+// inner-message loop the first time.
 const int kInitialTimeoutInMS = 30000;
 
 // Delay for sub-sequent time-outs once the initial time-out happened.
 const int kSubsequentTimeoutInMS = 5000;
 
 namespace {
 
 bool DieFileDie(const std::wstring& file, bool recurse) {
   if (!file_util::PathExists(file))
     return true;
 
   // Sometimes Delete fails, so try a few more times.
   for (int i = 0; i < 10; ++i) {
     if (file_util::Delete(file, recurse))
       return true;
     PlatformThread::Sleep(100);
   }
   return false;
 }
 
 }  // namespace
 
 InProcessBrowserTest::InProcessBrowserTest()
     : browser_(NULL),
       show_window_(false),
       dom_automation_enabled_(false),
       single_process_(false),
-      original_single_process_(false) {
+      original_single_process_(false),
+      initial_timeout_(kInitialTimeoutInMS) {
 }
 
 void InProcessBrowserTest::SetUp() {
   // Cleanup the user data dir.
   std::wstring user_data_dir;
   PathService::Get(chrome::DIR_USER_DATA, &user_data_dir);
   ASSERT_LT(10, static_cast<int>(user_data_dir.size())) <<
       "The user data directory name passed into this test was too "
       "short to delete safely.  Please check the user-data-dir "
       "argument and try again.";
@@ skipping 140 matching lines @@
   chrome_path = chrome_path.Append(
       WideToASCII(chrome::kBrowserProcessExecutablePath));
 #endif
   CHECK(PathService::Override(base::FILE_EXE, chrome_path));
 
   browser_ = CreateBrowser(profile);
 
   // Start the timeout timer to prevent hangs.
   MessageLoopForUI::current()->PostDelayedTask(FROM_HERE,
       NewRunnableMethod(this, &InProcessBrowserTest::TimedOut),
-      kInitialTimeoutInMS);
+      initial_timeout_);
 
   RunTestOnMainThread();
   CleanUpOnMainThread();
 
   BrowserList::const_iterator browser = BrowserList::begin();
   for (; browser != BrowserList::end(); ++browser)
     (*browser)->CloseAllTabs();
 
   // Stop the HTTP server.
   http_server_ = NULL;
@@ skipping 14 matching lines @@
 
   GTEST_NONFATAL_FAILURE_("Timed-out");
 
   // Start the timeout timer to prevent hangs.
   MessageLoopForUI::current()->PostDelayedTask(FROM_HERE,
       NewRunnableMethod(this, &InProcessBrowserTest::TimedOut),
       kSubsequentTimeoutInMS);
 
   MessageLoopForUI::current()->Quit();
 }
+
+void InProcessBrowserTest::SetInitialTimeoutInMS(int timeout_value) {
+  DCHECK_GT(timeout_value, 0);
+  initial_timeout_ = timeout_value;
+}