| Index: chrome_frame/test/test_mock_with_web_server.h
|
| diff --git a/chrome_frame/test/test_mock_with_web_server.h b/chrome_frame/test/test_mock_with_web_server.h
|
| index 53fccb15a3f99528cf3bbba572026d5fa2b38ea6..2d71721842d10f61f66a8576ff84a29c3294db55 100644
|
| --- a/chrome_frame/test/test_mock_with_web_server.h
|
| +++ b/chrome_frame/test/test_mock_with_web_server.h
|
| @@ -75,15 +75,22 @@ class MockWebBrowserEventSink : public chrome_frame_test::WebBrowserEventSink {
|
| MOCK_METHOD2(OnWindowDetected, void (HWND hwnd, // NOLINT
|
| const std::string& caption));
|
|
|
| - // Test expectations
|
| + // Test expectations for general navigations.
|
| ExpectationSet ExpectNavigationCardinality(const std::wstring& url,
|
| testing::Cardinality cardinality);
|
| ExpectationSet ExpectNavigation(const std::wstring& url);
|
| ExpectationSet ExpectNavigationAndSwitch(const std::wstring& url);
|
| ExpectationSet ExpectNavigationAndSwitchSequence(const std::wstring& url);
|
| ExpectationSet ExpectNewWindow(MockWebBrowserEventSink* new_window_mock);
|
| - ExpectationSet MockWebBrowserEventSink::ExpectNavigationSequenceForAnchors(
|
| - const std::wstring& url);
|
| + ExpectationSet ExpectNavigationSequenceForAnchors(const std::wstring& url);
|
| +
|
| + // Test expectations for navigations with an IE renderer.
|
| + // Expect one navigation to occur.
|
| + ExpectationSet ExpectNavigationInIE(const std::wstring& url);
|
| + // Expect a new window to be opened to |url|. Set |new_window_mock| as the new
|
| + // window.
|
| + ExpectationSet ExpectNewWindowWithIE(
|
| + const std::wstring& url, MockWebBrowserEventSink* new_window_mock);
|
| };
|
|
|
| ACTION_P(CloseBrowserMock, mock) {
|
|
|