Attempt to fix ChromeFrameTestWithWebServer tests.

chrome_frame/test/mock_ie_event_sink_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 "chrome_frame/test/mock_ie_event_sink_test.h"
 
 #include <sstream>
 
 #include "base/utf_string_conversions.h"
 #include "base/win/scoped_variant.h"
@@ skipping 162 matching lines @@
       if (result.type() == VT_I4) {
         EXPECT_EQ(ready_state, static_cast<int>(V_I4(&result)));
       }
     }
   }
 }
 
 // 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", ""));
 }
 
 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);
 
   EXPECT_CALL(ie_mock_, OnQuit())
       .WillOnce(QUIT_LOOP(loop_));
 
   HRESULT hr = ie_mock_.event_sink()->LaunchIEAndNavigate(url, &ie_mock_);
   ASSERT_HRESULT_SUCCEEDED(hr);
   if (hr != S_FALSE) {
@@ skipping 11 matching lines @@
     const std::wstring& relative_path) {
   return server_mock_.root_dir().Append(relative_path);
 }
 
 std::wstring MockIEEventSinkTest::GetTestUrl(
     const std::wstring& relative_path) {
   return server_mock_.Resolve(relative_path.c_str());
 }
 
 }  // namespace chrome_frame_test