Attempt to fix ChromeFrameTestWithWebServer tests.

chrome_frame/test/mock_ie_event_sink_test.cc

Index: chrome_frame/test/mock_ie_event_sink_test.cc
diff --git a/chrome_frame/test/mock_ie_event_sink_test.cc b/chrome_frame/test/mock_ie_event_sink_test.cc
index c858362a09f31cd80fb2cd6d78154507a329969b..49d6840464be0330b79ec98a963f8b707809fad6 100644
--- a/chrome_frame/test/mock_ie_event_sink_test.cc
+++ b/chrome_frame/test/mock_ie_event_sink_test.cc
@@ -180,6 +180,7 @@ void MockIEEventSink::ExpectDocumentReadystate(int ready_state) {
 // MockIEEventSinkTest methods
 MockIEEventSinkTest::MockIEEventSinkTest() : server_mock_(1337, L"127.0.0.1",
                                                           GetTestDataFolder()) {
+  loop_.set_snapshot_on_timeout(true);
   EXPECT_CALL(server_mock_, Get(_, StrCaseEq(L"/favicon.ico"), _))
       .WillRepeatedly(SendFast("HTTP/1.1 404 Not Found", ""));
 }
@@ -187,20 +188,21 @@ MockIEEventSinkTest::MockIEEventSinkTest() : server_mock_(1337, L"127.0.0.1",
 MockIEEventSinkTest::MockIEEventSinkTest(int port, const std::wstring& address,
                                          const FilePath& root_dir)
     : server_mock_(port, address, root_dir) {
+  loop_.set_snapshot_on_timeout(true);
   EXPECT_CALL(server_mock_, Get(_, StrCaseEq(L"/favicon.ico"), _))
       .WillRepeatedly(SendFast("HTTP/1.1 404 Not Found", ""));
 }
 
 void MockIEEventSinkTest::LaunchIEAndNavigate(const std::wstring& url) {
-  LaunchIENavigateAndLoop(url, kChromeFrameLongNavigationTimeoutInSeconds);
+  LaunchIENavigateAndLoop(url, kChromeFrameLongNavigationTimeout);
 }
 
 void MockIEEventSinkTest::LaunchIENavigateAndLoop(const std::wstring& url,
-                                                  int timeout) {
+                                                  base::TimeDelta timeout) {
   if (GetInstalledIEVersion() >= IE_8) {
     chrome_frame_test::ClearIESessionHistory();
   }
-  hung_call_detector_ = HungCOMCallDetector::Setup(timeout);
+  hung_call_detector_ = HungCOMCallDetector::Setup(ceil(timeout.InSecondsF()));

[robertshield, 2012/04/11 17:03:36]

why no InSeconds()?

[grt (UTC plus 2), 2012/04/11 17:33:08]

InSeconds would return 0 if timeout is less than 500ms, which will likely be too
short for the detector.

   EXPECT_TRUE(hung_call_detector_ != NULL);
 
   IEEventSink::SetAbnormalShutdown(false);