| Index: chrome_frame/test/ui_test.cc
|
| diff --git a/chrome_frame/test/ui_test.cc b/chrome_frame/test/ui_test.cc
|
| index 52fc342a92b52122de336a5ddff2002e16991d9c..4398178075f6fed370853dc186e77d008bf64ae6 100644
|
| --- a/chrome_frame/test/ui_test.cc
|
| +++ b/chrome_frame/test/ui_test.cc
|
| @@ -93,12 +93,18 @@ TEST_P(FullTabUITest, DISABLED_KeyboardBackForward) {
|
| EXPECT_CALL(ie_mock_, OnLoad(in_cf, StrEq(page2)))
|
| .WillOnce(testing::DoAll(
|
| SetFocusToRenderer(&ie_mock_),
|
| - DelaySendScanCode(&loop_, 1000, bkspace, simulate_input::NONE)));
|
| + DelaySendScanCode(&loop_,
|
| + base::TimeDelta::FromSeconds(1),
|
| + bkspace,
|
| + simulate_input::NONE)));
|
|
|
| EXPECT_CALL(ie_mock_, OnLoad(in_cf, StrEq(page1)))
|
| .WillOnce(testing::DoAll(
|
| SetFocusToRenderer(&ie_mock_),
|
| - DelaySendScanCode(&loop_, 1000, bkspace, simulate_input::SHIFT)));
|
| + DelaySendScanCode(&loop_,
|
| + base::TimeDelta::FromSeconds(1),
|
| + bkspace,
|
| + simulate_input::SHIFT)));
|
|
|
| EXPECT_CALL(ie_mock_, OnLoad(in_cf, StrEq(page2)))
|
| .WillOnce(CloseBrowserMock(&ie_mock_));
|
| @@ -128,7 +134,10 @@ TEST_P(FullTabUITest, CtrlN) {
|
| .WillOnce(testing::DoAll(
|
| WatchWindow(&win_observer_mock, kNewWindowTitlePattern, ""),
|
| SetFocusToRenderer(&ie_mock_),
|
| - DelaySendChar(&loop_, 1000, 'n', simulate_input::CONTROL)));
|
| + DelaySendChar(&loop_,
|
| + base::TimeDelta::FromSeconds(1),
|
| + 'n',
|
| + simulate_input::CONTROL)));
|
|
|
| // Watch for new window. It appears that the window close message cannot be
|
| // reliably delivered immediately upon receipt of the window open event.
|
| @@ -165,7 +174,10 @@ TEST_P(FullTabUITest, CtrlF) {
|
| .WillOnce(testing::DoAll(
|
| WatchWindow(&win_observer_mock, kFindDialogCaption, ""),
|
| SetFocusToRenderer(&ie_mock_),
|
| - DelaySendChar(&loop_, 1500, 'f', simulate_input::CONTROL)));
|
| + DelaySendChar(&loop_,
|
| + base::TimeDelta::FromMilliseconds(1500),
|
| + 'f',
|
| + simulate_input::CONTROL)));
|
|
|
| EXPECT_CALL(win_observer_mock, OnWindowOpen(_))
|
| .WillOnce(CloseBrowserMock(&ie_mock_));
|
| @@ -190,8 +202,12 @@ TEST_P(FullTabUITest, CtrlR) {
|
| .Times(testing::AtMost(2))
|
| .WillOnce(testing::DoAll(
|
| SetFocusToRenderer(&ie_mock_),
|
| - DelaySendChar(&loop_, 1000, 'r', simulate_input::CONTROL),
|
| - DelayCloseBrowserMock(&loop_, 4000, &ie_mock_)))
|
| + DelaySendChar(&loop_,
|
| + base::TimeDelta::FromSeconds(1),
|
| + 'r',
|
| + simulate_input::CONTROL),
|
| + DelayCloseBrowserMock(
|
| + &loop_, base::TimeDelta::FromSeconds(4), &ie_mock_)))
|
| .WillRepeatedly(testing::Return());
|
|
|
| LaunchIENavigateAndLoop(GetSimplePageUrl(),
|
| @@ -209,7 +225,10 @@ TEST_P(FullTabUITest, CtrlW) {
|
| StrEq(GetSimplePageUrl())))
|
| .WillOnce(testing::DoAll(
|
| SetFocusToRenderer(&ie_mock_),
|
| - DelaySendChar(&loop_, 1000, 'w', simulate_input::CONTROL)));
|
| + DelaySendChar(&loop_,
|
| + base::TimeDelta::FromSeconds(1),
|
| + 'w',
|
| + simulate_input::CONTROL)));
|
|
|
| LaunchIENavigateAndLoop(GetSimplePageUrl(),
|
| kChromeFrameVeryLongNavigationTimeout);
|
| @@ -226,7 +245,9 @@ TEST_P(FullTabUITest, AltD) {
|
| StrEq(GetSimplePageUrl())))
|
| .WillOnce(testing::DoAll(
|
| SetFocusToRenderer(&ie_mock_),
|
| - TypeUrlInAddressBar(&loop_, GetLinkPageUrl(), 1500)));
|
| + TypeUrlInAddressBar(&loop_,
|
| + GetLinkPageUrl(),
|
| + base::TimeDelta::FromMilliseconds(1500))));
|
|
|
| EXPECT_CALL(ie_mock_, OnLoad(GetParam().invokes_cf(),
|
| StrEq(GetLinkPageUrl())))
|
| @@ -271,9 +292,10 @@ TEST_P(FullTabUITest, ViewSource) {
|
| VARIANT empty = base::win::ScopedVariant::kEmptyVariant;
|
| EXPECT_CALL(ie_mock_, OnLoad(in_cf,
|
| StrEq(GetSimplePageUrl())))
|
| - .WillOnce(DelayExecCommand(&ie_mock_, &loop_, 0, &CGID_MSHTML,
|
| - static_cast<OLECMDID>(IDM_VIEWSOURCE),
|
| - OLECMDEXECOPT_DONTPROMPTUSER, &empty, &empty));
|
| + .WillOnce(DelayExecCommand(
|
| + &ie_mock_, &loop_, base::TimeDelta(), &CGID_MSHTML,
|
| + static_cast<OLECMDID>(IDM_VIEWSOURCE),
|
| + OLECMDEXECOPT_DONTPROMPTUSER, &empty, &empty));
|
|
|
| // Expect notification for view-source window, handle new window event
|
| // and attach a new ie_mock_ to the received web browser
|
| @@ -337,7 +359,8 @@ TEST_P(FullTabUITest, TabCrashReload) {
|
| EXPECT_CALL(prop_listener, OnChanged(DISPID_READYSTATE))
|
| .WillOnce(DoAll(
|
| ExpectDocumentReadystate(&ie_mock_, READYSTATE_UNINITIALIZED),
|
| - DelayNavigateToCurrentUrl(&ie_mock_, &loop_, 10)));
|
| + DelayNavigateToCurrentUrl(
|
| + &ie_mock_, &loop_, base::TimeDelta::FromMilliseconds(10))));
|
|
|
| EXPECT_CALL(ie_mock_, OnLoad(_, StrEq(GetSimplePageUrl())))
|
| .WillOnce(CloseBrowserMock(&ie_mock_));
|
| @@ -371,8 +394,9 @@ TEST_P(FullTabUITest, DISABLED_TabCrashRefresh) {
|
| .WillOnce(DoAll(
|
| DisconnectDocPropNotifySink(&prop_listener),
|
| ExpectDocumentReadystate(&ie_mock_, READYSTATE_UNINITIALIZED),
|
| - DelayExecCommand(&ie_mock_, &loop_, 10, static_cast<GUID*>(NULL),
|
| - OLECMDID_REFRESH, 0, &empty, &empty)));
|
| + DelayExecCommand(
|
| + &ie_mock_, &loop_, base::TimeDelta::FromMilliseconds(10),
|
| + static_cast<GUID*>(NULL), OLECMDID_REFRESH, 0, &empty, &empty)));
|
|
|
| EXPECT_CALL(ie_mock_, OnLoad(_, StrEq(GetSimplePageUrl())))
|
| .WillOnce(CloseBrowserMock(&ie_mock_));
|
|
|