Use TimeDelta for Chrome Frame test's TimedMsgLoop.

chrome_frame/test/test_with_web_server.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_frame/test/test_with_web_server.h"
 
 #include "base/base_paths.h"
 #include "base/file_version_info.h"
 #include "base/path_service.h"
 #include "base/stringprintf.h"
 #include "base/test/test_timeouts.h"
 #include "base/utf_string_conversions.h"
 #include "base/win/windows_version.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/installer/util/product.h"
 #include "chrome/installer/util/install_util.h"
 #include "chrome/installer/util/helper.h"
 #include "chrome_frame/html_utils.h"
 #include "chrome_frame/utils.h"
 #include "chrome_frame/test/chrome_frame_test_utils.h"
 #include "chrome_frame/test/mock_ie_event_sink_actions.h"
 #include "chrome_frame/test/mock_ie_event_sink_test.h"
 #include "chrome_frame/test/test_scrubber.h"
 #include "net/base/mime_util.h"
 #include "net/http/http_util.h"
 
-using chrome_frame_test::kChromeFrameLongNavigationTimeoutInSeconds;
-using chrome_frame_test::kChromeFrameVeryLongNavigationTimeoutInSeconds;
+using chrome_frame_test::kChromeFrameLongNavigationTimeout;
+using chrome_frame_test::kChromeFrameVeryLongNavigationTimeout;
 
 using testing::_;
 using testing::StrCaseEq;
 
 const wchar_t kDocRoot[] = L"chrome_frame\\test\\data";
 
 namespace {
 
 // Helper method for creating the appropriate HTTP response headers.
 std::string CreateHttpHeaders(CFInvocation invocation,
@@ skipping 155 matching lines @@
     }
     browser_handle_.Close();
   }
 }
 
 bool ChromeFrameTestWithWebServer::BringBrowserToTop() {
   return simulate_input::EnsureProcessInForeground(
       GetProcessId(browser_handle_));
 }
 
-bool ChromeFrameTestWithWebServer::WaitForTestToComplete(int milliseconds) {
-  loop_.RunFor(milliseconds/1000);
+bool ChromeFrameTestWithWebServer::WaitForTestToComplete(
+    base::TimeDelta duration) {
+  loop_.RunFor(duration);
   return true;
 }
 
 bool ChromeFrameTestWithWebServer::WaitForOnLoad(int milliseconds) {
   return false;
 }
 
 const wchar_t kPostedResultSubstring[] = L"/writefile/";
 
 void ChromeFrameTestWithWebServer::SimpleBrowserTestExpectedResult(
     BrowserKind browser, const wchar_t* page, const char* result) {
   server_mock_.ExpectAndHandlePostedResult(CFInvocation(CFInvocation::NONE),
                                            kPostedResultSubstring);
   ASSERT_TRUE(LaunchBrowser(browser, page));
-  WaitForTestToComplete(TestTimeouts::action_max_timeout_ms());
+  WaitForTestToComplete(TestTimeouts::action_max_timeout());
   ASSERT_EQ(result, server_mock_.posted_result());
 }
 
 void ChromeFrameTestWithWebServer::SimpleBrowserTest(BrowserKind browser,
     const wchar_t* page) {
   SimpleBrowserTestExpectedResult(browser, page, "OK");
 }
 
 void ChromeFrameTestWithWebServer::VersionTest(BrowserKind browser,
     const wchar_t* page) {
@@ skipping 26 matching lines @@
       version = version_info->product_version();
   }
 
   server_mock_.set_expected_result(WideToUTF8(version));
 
   EXPECT_TRUE(version_info);
   EXPECT_FALSE(version.empty());
   server_mock_.ExpectAndHandlePostedResult(CFInvocation(CFInvocation::NONE),
                                            kPostedResultSubstring);
   EXPECT_TRUE(LaunchBrowser(browser, page));
-  WaitForTestToComplete(TestTimeouts::action_max_timeout_ms());
+  WaitForTestToComplete(TestTimeouts::action_max_timeout());
   ASSERT_EQ(version, UTF8ToWide(server_mock_.posted_result()));
 }
 
 // MockWebServer methods
 void MockWebServer::ExpectAndServeRequest(CFInvocation invocation,
                                           const std::wstring& url) {
   ExpectAndServeRequestWithCardinality(invocation, url, testing::Exactly(1));
 }
 
 void MockWebServer::ExpectAndServeRequestWithCardinality(
@@ skipping 384 matching lines @@
     L"install_flow_test.html";
 
 TEST_F(ChromeFrameTestWithWebServer, FullTabModeIE_InstallFlowTest) {
   if (base::win::GetVersion() < base::win::VERSION_VISTA) {
     ScopedChromeFrameRegistrar::UnregisterAtPath(
         GetChromeFrameBuildPath().value(),
         chrome_frame_test::GetTestBedType());
 
     ASSERT_TRUE(LaunchBrowser(IE, kInstallFlowTestUrl));
 
-    loop_.RunFor(kChromeFrameLongNavigationTimeoutInSeconds);
+    loop_.RunFor(kChromeFrameLongNavigationTimeout);
 
     ScopedChromeFrameRegistrar::RegisterAtPath(
         GetChromeFrameBuildPath().value(),
         chrome_frame_test::GetTestBedType());
 
     server_mock_.ExpectAndHandlePostedResult(CFInvocation(CFInvocation::NONE),
                                              kPostedResultSubstring);
-    loop_.RunFor(kChromeFrameLongNavigationTimeoutInSeconds);
+    loop_.RunFor(kChromeFrameLongNavigationTimeout);
 
     chrome_frame_test::CloseAllIEWindows();
     ASSERT_EQ("OK", server_mock_.posted_result());
   }
 }
 
 const wchar_t kMultipleCFInstancesTestUrl[] =
     L"multiple_cf_instances_main.html";
 
 TEST_F(ChromeFrameTestWithWebServer, WidgetModeIE_MultipleCFInstances) {
@@ skipping 30 matching lines @@
     L"full_tab_post_target_cf.html",
     L"chrome_frame_tester_helpers.js",
   };
 
   SimpleWebServerTest server(46664);
   server.PopulateStaticFileListT<test_server::FileResponse>(kPages,
       arraysize(kPages), GetCFTestFilePath());
 
   ASSERT_TRUE(LaunchBrowser(IE, server.FormatHttpPath(kPages[0]).c_str()));
 
-  loop_.RunFor(kChromeFrameLongNavigationTimeoutInSeconds);
+  loop_.RunFor(kChromeFrameLongNavigationTimeout);
 
   const test_server::Request* request = NULL;
   server.FindRequest("/quit?OK", &request);
   ASSERT_TRUE(request != NULL);
   EXPECT_EQ("OK", request->arguments());
 
   if (request->arguments().compare("OK") == 0) {
     // Check how many requests we got for the cf page.  Also expect it to be
     // a POST.
     int requests = server.GetRequestCountForPage(kPages[1], "POST");
@@ skipping 11 matching lines @@
     L"chrome_frame_tester_helpers.js",
   };
 
   SimpleWebServerTest server(46664);
 
   server.PopulateStaticFileListT<test_server::FileResponse>(kPages,
       arraysize(kPages), GetCFTestFilePath());
 
   ASSERT_TRUE(LaunchBrowser(IE, server.FormatHttpPath(kPages[0]).c_str()));
 
-  loop_.RunFor(kChromeFrameVeryLongNavigationTimeoutInSeconds);
+  loop_.RunFor(kChromeFrameVeryLongNavigationTimeout);
 
   const test_server::Request* request = NULL;
   server.FindRequest("/quit?OK", &request);
   ASSERT_TRUE(request != NULL);
   EXPECT_EQ("OK", request->arguments());
 
   if (request->arguments().compare("OK") == 0) {
     // Check how many requests we got for the cf page and check that it was
     // a GET.
     int requests = server.GetRequestCountForPage(kPages[1], "GET");
@@ skipping 97 matching lines @@
     L"mshtml_refresh_test.html",
     L"mshtml_refresh_test_popup.html",
   };
 
   SimpleWebServerTest server(46664);
   server.PopulateStaticFileListT<UaTemplateFileResponse>(kPages,
       arraysize(kPages), GetCFTestFilePath());
 
   ASSERT_TRUE(LaunchBrowser(IE, server.FormatHttpPath(kPages[0]).c_str()));
 
-  loop_.RunFor(kChromeFrameLongNavigationTimeoutInSeconds);
+  loop_.RunFor(kChromeFrameLongNavigationTimeout);
 
   test_server::SimpleWebServer* ws = server.web_server();
   const test_server::ConnectionList& connections = ws->connections();
   test_server::ConnectionList::const_iterator it = connections.begin();
   int requests_for_first_page = 0;
   for (; it != connections.end(); ++it) {
     test_server::Connection* c = (*it);
     const test_server::Request& r = c->request();
     if (!r.path().empty() &&
         ASCIIToWide(r.path().substr(1)).compare(kPages[0]) == 0) {
@@ skipping 120 matching lines @@
       .Times(testing::AtMost(1))
       .WillOnce(QUIT_LOOP(loop_));
 
   SimpleWebServerTest server(46664);
   CustomResponse* response = new CustomResponse("/form.html");
   server.web_server()->AddResponse(response);
 
   std::wstring url(server.FormatHttpPath(L"form.html"));
 
   ASSERT_TRUE(LaunchBrowser(IE, url.c_str()));
-  loop_.RunFor(kChromeFrameLongNavigationTimeoutInSeconds);
+  loop_.RunFor(kChromeFrameLongNavigationTimeout);
 
   EXPECT_EQ(1, response->get_request_count());
   EXPECT_EQ(1, response->post_request_count());
 }