Use TimeDelta for Chrome Frame test's TimedMsgLoop.

chrome_frame/test/navigation_test.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 <string>
 
 #include "base/test/test_file_util.h"
 #include "base/win/scoped_comptr.h"
 #include "base/win/windows_version.h"
 #include "chrome_frame/test/chrome_frame_test_utils.h"
@@ skipping 168 matching lines @@
           VerifyAddressBarUrl(&ie_mock_),
           DelayGoForward(&ie_mock_, &loop_, 0)));
 
   // We have reached url 2 and have 1 back & 1 forward entries for url 1 & 3.
   ie_mock_.ExpectNavigation(in_cf, page3);
   EXPECT_CALL(ie_mock_, OnLoad(in_cf, StrEq(page3)))
       .WillOnce(testing::DoAll(
           VerifyAddressBarUrl(&ie_mock_),
           CloseBrowserMock(&ie_mock_)));
 
-  LaunchIENavigateAndLoop(page1,
-                          kChromeFrameLongNavigationTimeoutInSeconds * 2);
+  LaunchIENavigateAndLoop(page1, kChromeFrameLongNavigationTimeout * 2);
 }
 
 // Test multiple back and forward operations among urls with anchors.
 TEST_P(FullTabNavigationTest, BackForwardAnchor) {
   std::wstring title(GetAnchorPageTitle());
   bool in_cf = GetParam().invokes_cf();
   ie_mock_.ExpectAnyNavigations();
   server_mock_.ExpectAndServeAnyRequests(GetParam());
   MockAccEventObserver acc_observer;
   EXPECT_CALL(acc_observer, OnAccDocLoad(_)).Times(testing::AnyNumber());
@@ skipping 155 matching lines @@
       .WillOnce(CloseBrowserMock(&new_window_mock));
 
   EXPECT_CALL(new_window_mock, OnLoad(_, _))
       .Times(testing::AtMost(1));
 
   EXPECT_CALL(new_window_mock, OnQuit())
       .Times(1)
       .WillOnce(CloseBrowserMock(&ie_mock_));
 
   // OnNavigateError can take a long time to fire.
-  LaunchIENavigateAndLoop(parent_url,
-                          kChromeFrameLongNavigationTimeoutInSeconds * 4);
+  LaunchIENavigateAndLoop(parent_url, kChromeFrameLongNavigationTimeout * 4);
   ASSERT_TRUE(new_window_mock.event_sink()->web_browser2() != NULL);
 }
 
 // Tests that the parent window can successfully close its popup through
 // the javascript close method.
 TEST_P(FullTabNavigationTest, JavascriptWindowOpenCanClose) {
   // Please see http://code.google.com/p/chromium/issues/detail?id=60987
   // for more information on why this test is disabled for Vista with IE7.
   if (base::win::GetVersion() == base::win::VERSION_VISTA &&
       GetInstalledIEVersion() == IE_7) {
@@ skipping 18 matching lines @@
 
   ie_mock_.ExpectNewWindow(&new_window_mock);
   EXPECT_CALL(new_window_mock, OnLoad(_, StrEq(GetSimplePageUrl())))
       .Times(testing::AtMost(2))
       .WillOnce(PostCharMessageToRenderer(&ie_mock_, 'C'))  // close the popup
       .WillOnce(testing::Return());
 
   EXPECT_CALL(new_window_mock, OnQuit())
       .WillOnce(CloseBrowserMock(&ie_mock_));
 
-  LaunchIENavigateAndLoop(parent_url,
-                          kChromeFrameLongNavigationTimeoutInSeconds * 2);
+  LaunchIENavigateAndLoop(parent_url, kChromeFrameLongNavigationTimeout * 2);
 }
 
 // Parameter for tests using the NavigationTransitionTest fixture. Includes two
 // pages, each with their own possible CF invocation.
 struct NavigationTransitionTestParameter {
   NavigationTransitionTestParameter(CFInvocation::Type type1,
                                     CFInvocation::Type type2) {
     page1_ = CFInvocation(type1);
     page2_ = CFInvocation(type2);
   }
@@ skipping 81 matching lines @@
                                                        new_window_url);
   server_mock_.ExpectAndServeRequest(page2_, new_window_url);
   EXPECT_CALL(new_window_mock, OnLoad(expect_cf, StrEq(new_window_url)))
       .WillOnce(testing::DoAll(
           ValidateWindowSize(&new_window_mock, 10, 10, 250, 250),
           CloseBrowserMock(&new_window_mock)));
 
   EXPECT_CALL(new_window_mock, OnQuit())
       .WillOnce(CloseBrowserMock(&ie_mock_));
 
-  LaunchIENavigateAndLoop(parent_url,
-                          kChromeFrameLongNavigationTimeoutInSeconds * 2);
+  LaunchIENavigateAndLoop(parent_url, kChromeFrameLongNavigationTimeout * 2);
 }
 
 // Test redirection with window.location in Javascript.
 // Disabled because crashes IE occasionally: http://crbug.com/48849.
 TEST_P(NavigationTransitionTest, DISABLED_JavascriptRedirection) {
   std::wstring redirect_url = GetTestUrl(L"javascript_redirect.html");
 
   ie_mock_.ExpectNavigation(page1_.invokes_cf(), redirect_url);
   server_mock_.ExpectAndServeRequest(page1_, redirect_url);
   EXPECT_CALL(ie_mock_, OnLoad(page1_.invokes_cf(), StrEq(redirect_url)))
@@ skipping 335 matching lines @@
             AccSendCharMessage(file_name_box, L'a'),
             AccSetValue(file_name_box, temp_file_path.value()),
             AccDoDefaultAction(AccObjectMatcher(L"Save", L"push button"))));
 
   EXPECT_CALL(save_dialog_watcher, OnWindowClose(_))
         .WillOnce(testing::DoAll(
             WaitForFileSave(temp_file_path, 2000),
             testing::InvokeWithoutArgs(
                 testing::CreateFunctor(CloseWindow, &owner_window)),
             CloseBrowserMock(&ie_mock_)));
-  LaunchIENavigateAndLoop(src_url,
-                          kChromeFrameVeryLongNavigationTimeoutInSeconds);
+  LaunchIENavigateAndLoop(src_url, kChromeFrameVeryLongNavigationTimeout);
 
   std::string data;
   EXPECT_TRUE(file_util::ReadFileToString(temp_file_path, &data));
   EXPECT_EQ("hello", data);
   file_util::DieFileDie(temp_file_path, false);
 }
 
 // Test fixture for testing if http header works for supported content types
 class HttpHeaderTest : public MockIEEventSinkTest, public testing::Test {
  public:
@@ skipping 85 matching lines @@
                                                   StrEq(src_url)),
                                 _, _, _, _, _));
   EXPECT_CALL(ie_mock_,
               OnNavigateComplete2(_, testing::Field(&VARIANT::bstrVal,
                                                     StrEq(src_url))));
   EXPECT_CALL(ie_mock_, OnLoad(in_cf, StrEq(src_url)))
       .Times(2)
       .WillOnce(DelayRefresh(&ie_mock_, &loop_, 50))
       .WillOnce(CloseBrowserMock(&ie_mock_));
 
-  LaunchIENavigateAndLoop(src_url,
-                          kChromeFrameVeryLongNavigationTimeoutInSeconds);
+  LaunchIENavigateAndLoop(src_url, kChromeFrameVeryLongNavigationTimeout);
 }
 
 class FullTabSeleniumTest
     : public MockIEEventSinkTest, public testing::TestWithParam<CFInvocation> {
  public:
   FullTabSeleniumTest()
       : MockIEEventSinkTest(1337, L"127.0.0.1", GetSeleniumTestFolder()) {}
 };
 
 ACTION(VerifySeleniumCoreTestResults) {
@@ skipping 50 matching lines @@
                             testing::StartsWith(attach_url_prefix)))
       .Times(testing::AnyNumber());
 
   // At the end the tests will post us a message.  See _onTestSuiteComplete in
   // ...\src\data\selenium_core\core\scripts\selenium-testrunner.js
   EXPECT_CALL(ie_mock_, OnMessage(_, _, _))
       .WillOnce(testing::DoAll(VerifySeleniumCoreTestResults(),
                                CloseBrowserMock(&ie_mock_)));
 
   // Selenium tests take longer to finish, lets give it 2 mins.
-  const int kSeleniumTestTimeout = 120;
+  const base::TimeDelta kSeleniumTestTimeout = base::TimeDelta::FromMinutes(2);
   LaunchIENavigateAndLoop(url, kSeleniumTestTimeout);
 }
 
 // See bug http://code.google.com/p/chromium/issues/detail?id=64901
 // This test does the following:-
 // Navigates IE to a non ChromeFrame URL.
 // Performs a top level form post in the document
 // In response to the POST send over a html document containing a meta tag
 // This would cause IE to switch to ChromeFrame.
 // Refresh the page in ChromeFrame.
@@ skipping 57 matching lines @@
   EXPECT_CALL(ie_mock_, OnBeforeNavigate2(_,
                               testing::Field(&VARIANT::bstrVal,
                               StrEq(tgt_url)), _, _, _, _, _))
       .Times(2);
 
   EXPECT_CALL(ie_mock_, OnNavigateComplete2(_,
                               testing::Field(&VARIANT::bstrVal,
                               StrEq(tgt_url))))
       .Times(2);
 
-  LaunchIENavigateAndLoop(src_url,
-                          kChromeFrameVeryLongNavigationTimeoutInSeconds);
+  LaunchIENavigateAndLoop(src_url, kChromeFrameVeryLongNavigationTimeout);
 }
 
 MATCHER_P(UserAgentHeaderMatcher, ua_string, "") {
   std::string headers = arg.headers();
   StringToUpperASCII(&headers);
 
   std::string ua_string_to_search = ua_string;
   StringToUpperASCII(&ua_string_to_search);
 
   net::HttpUtil::HeadersIterator it(headers.begin(), headers.end(),
@@ skipping 62 matching lines @@
         .Times(2)
         .WillOnce(DelayRefresh(&ie_mock_, &loop_, 50))
         .WillOnce(CloseBrowserMock(&ie_mock_));
   } else {
     // As mentioned above, we only receive an OnLoad for the intial load, not
     // for the refresh.
     EXPECT_CALL(ie_mock_, OnLoad(in_cf, StrEq(src_url)))
         .WillOnce(DelayRefresh(&ie_mock_, &loop_, 50));
   }
 
-  LaunchIENavigateAndLoop(src_url,
-                          kChromeFrameVeryLongNavigationTimeoutInSeconds);
+  LaunchIENavigateAndLoop(src_url, kChromeFrameVeryLongNavigationTimeout);
 }
 
 // Link navigations in the same domain specified with the noreferrer flag
 // should be opened in the host browser.
 TEST_F(FullTabNavigationTest, JavascriptWindowOpenNoReferrerOpensInHost) {
   // Please see http://code.google.com/p/chromium/issues/detail?id=60987
   // for more information on why this test is disabled for Vista with IE7.
   if (base::win::GetVersion() == base::win::VERSION_VISTA &&
       GetInstalledIEVersion() == IE_7) {
     LOG(INFO) << "Not running test on Vista with IE7";
@@ skipping 61 matching lines @@
   EXPECT_CALL(new_window_mock, OnLoad(false, StrEq(new_window_url)))
       .WillOnce(CloseBrowserMock(&new_window_mock));
 
   EXPECT_CALL(new_window_mock, OnQuit())
       .WillOnce(CloseBrowserMock(
           &no_referrer_target_opener_window_mock));
 
   EXPECT_CALL(no_referrer_target_opener_window_mock, OnQuit())
       .WillOnce(CloseBrowserMock(&ie_mock_));
 
-  LaunchIENavigateAndLoop(initial_url,
-                          kChromeFrameVeryLongNavigationTimeoutInSeconds);
+  LaunchIENavigateAndLoop(initial_url, kChromeFrameVeryLongNavigationTimeout);
 }
 
 }  // namespace chrome_frame_test