Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(495)

Side by Side Diff: chrome_frame/test/ui_test.cc

Issue 4700003: Fix for the CtrlN ChromeFrame test failures on IE7. On IE7 it appears that we... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 10 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include <mshtmcid.h> 5 #include <mshtmcid.h>
6 #include <string> 6 #include <string>
7 7
8 #include "base/test/test_file_util.h" 8 #include "base/test/test_file_util.h"
9 #include "base/utf_string_conversions.h" 9 #include "base/utf_string_conversions.h"
10 #include "base/win/scoped_bstr.h" 10 #include "base/win/scoped_bstr.h"
(...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after
123 const char* kNewWindowTitlePattern = "*Internet Explorer*"; 123 const char* kNewWindowTitlePattern = "*Internet Explorer*";
124 EXPECT_CALL(ie_mock_, OnLoad(is_cf, StrEq(GetSimplePageUrl()))) 124 EXPECT_CALL(ie_mock_, OnLoad(is_cf, StrEq(GetSimplePageUrl())))
125 .WillOnce(testing::DoAll( 125 .WillOnce(testing::DoAll(
126 WatchWindow(&win_observer_mock, kNewWindowTitlePattern, ""), 126 WatchWindow(&win_observer_mock, kNewWindowTitlePattern, ""),
127 SetFocusToRenderer(&ie_mock_), 127 SetFocusToRenderer(&ie_mock_),
128 DelaySendChar(&loop_, 1000, 'n', simulate_input::CONTROL))); 128 DelaySendChar(&loop_, 1000, 'n', simulate_input::CONTROL)));
129 129
130 // Watch for new window. It appears that the window close message cannot be 130 // Watch for new window. It appears that the window close message cannot be
131 // reliably delivered immediately upon receipt of the window open event. 131 // reliably delivered immediately upon receipt of the window open event.
132 EXPECT_CALL(win_observer_mock, OnWindowOpen(_)) 132 EXPECT_CALL(win_observer_mock, OnWindowOpen(_))
133 .WillOnce(DelayDoCloseWindow(500)); 133 .Times(testing::AtMost(2))
134 .WillOnce(DelayDoCloseWindow(500))
135 .WillOnce(testing::Return());
134 136
135 EXPECT_CALL(win_observer_mock, OnWindowClose(_)) 137 EXPECT_CALL(win_observer_mock, OnWindowClose(_))
136 .WillOnce(CloseBrowserMock(&ie_mock_)); 138 .WillOnce(CloseBrowserMock(&ie_mock_));
137 139
138 LaunchIEAndNavigate(GetSimplePageUrl()); 140 LaunchIEAndNavigate(GetSimplePageUrl());
139 } 141 }
140 142
141 // Test that Ctrl+F opens the Find dialog. 143 // Test that Ctrl+F opens the Find dialog.
142 TEST_P(FullTabUITest, CtrlF) { 144 TEST_P(FullTabUITest, CtrlF) {
143 if (IsWorkstationLocked()) { 145 if (IsWorkstationLocked()) {
(...skipping 592 matching lines...) Expand 10 before | Expand all | Expand 10 after
736 EXPECT_CALL(acc_observer_, OnMenuPopup(_)) 738 EXPECT_CALL(acc_observer_, OnMenuPopup(_))
737 .WillOnce(AccLeftClick(AccObjectMatcher(L"Forward"))); 739 .WillOnce(AccLeftClick(AccObjectMatcher(L"Forward")));
738 740
739 EXPECT_CALL(ie_mock_, OnLoad(IN_CF, StrEq(page3))) 741 EXPECT_CALL(ie_mock_, OnLoad(IN_CF, StrEq(page3)))
740 .WillOnce(CloseBrowserMock(&ie_mock_)); 742 .WillOnce(CloseBrowserMock(&ie_mock_));
741 743
742 LaunchIEAndNavigate(page1); 744 LaunchIEAndNavigate(page1);
743 } 745 }
744 746
745 } // namespace chrome_frame_test 747 } // namespace chrome_frame_test
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698