| OLD | NEW |
| 1 // Copyright (c) 2006-2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2006-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 #include "chrome_frame/test/test_mock_with_web_server.h" | 4 #include "chrome_frame/test/test_mock_with_web_server.h" |
| 5 | 5 |
| 6 #include <mshtmcid.h> | 6 #include <mshtmcid.h> |
| 7 | 7 |
| 8 #include "base/scoped_bstr_win.h" | 8 #include "base/scoped_bstr_win.h" |
| 9 #include "chrome/common/url_constants.h" | 9 #include "chrome/common/url_constants.h" |
| 10 #include "chrome_frame/utils.h" | 10 #include "chrome_frame/utils.h" |
| (...skipping 185 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 196 | 196 |
| 197 ACTION_P(StopWindowWatching, mock) { | 197 ACTION_P(StopWindowWatching, mock) { |
| 198 mock->StopWatching(); | 198 mock->StopWatching(); |
| 199 } | 199 } |
| 200 | 200 |
| 201 ACTION_P6(DelaySendMouseClick, mock, loop, delay, x, y, button) { | 201 ACTION_P6(DelaySendMouseClick, mock, loop, delay, x, y, button) { |
| 202 loop->PostDelayedTask(FROM_HERE, NewRunnableMethod(mock, | 202 loop->PostDelayedTask(FROM_HERE, NewRunnableMethod(mock, |
| 203 &MockWebBrowserEventSink::SendMouseClick, x, y, button), delay); | 203 &MockWebBrowserEventSink::SendMouseClick, x, y, button), delay); |
| 204 } | 204 } |
| 205 | 205 |
| 206 ACTION_P4(DelaySendChar, loop, delay, c, mod) { | |
| 207 loop->PostDelayedTask(FROM_HERE, NewRunnableFunction( | |
| 208 simulate_input::SendCharA, c, mod), delay); | |
| 209 } | |
| 210 | |
| 211 ACTION_P3(DelaySendString, loop, delay, str) { | 206 ACTION_P3(DelaySendString, loop, delay, str) { |
| 212 loop->PostDelayedTask(FROM_HERE, NewRunnableFunction( | 207 loop->PostDelayedTask(FROM_HERE, NewRunnableFunction( |
| 213 simulate_input::SendStringW, str), delay); | 208 simulate_input::SendStringW, str), delay); |
| 214 } | 209 } |
| 215 | 210 |
| 216 ACTION_P5(SendExtendedKeysEnter, loop, delay, c, repeat, mod) { | 211 ACTION_P5(SendExtendedKeysEnter, loop, delay, c, repeat, mod) { |
| 217 chrome_frame_test::DelaySendExtendedKeysEnter(loop, delay, c, repeat, mod); | 212 chrome_frame_test::DelaySendExtendedKeysEnter(loop, delay, c, repeat, mod); |
| 218 } | 213 } |
| 219 | 214 |
| 220 ACTION(DoCloseWindow) { | 215 ACTION(DoCloseWindow) { |
| (...skipping 1413 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1634 if (hr == S_FALSE) | 1629 if (hr == S_FALSE) |
| 1635 return; | 1630 return; |
| 1636 | 1631 |
| 1637 ASSERT_TRUE(mock.web_browser2() != NULL); | 1632 ASSERT_TRUE(mock.web_browser2() != NULL); |
| 1638 | 1633 |
| 1639 loop.RunFor(kChromeFrameLongNavigationTimeoutInSeconds * 2); | 1634 loop.RunFor(kChromeFrameLongNavigationTimeoutInSeconds * 2); |
| 1640 | 1635 |
| 1641 ASSERT_TRUE(new_window_mock.web_browser2() != NULL); | 1636 ASSERT_TRUE(new_window_mock.web_browser2() != NULL); |
| 1642 } | 1637 } |
| 1643 | 1638 |
| OLD | NEW |