| OLD | NEW |
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 <string> | 5 #include <string> |
| 6 | 6 |
| 7 #include "chrome_frame/test/chrome_frame_test_utils.h" | 7 #include "chrome_frame/test/chrome_frame_test_utils.h" |
| 8 #include "chrome_frame/test/mock_ie_event_sink_actions.h" | 8 #include "chrome_frame/test/mock_ie_event_sink_actions.h" |
| 9 #include "chrome_frame/test/mock_ie_event_sink_test.h" | 9 #include "chrome_frame/test/mock_ie_event_sink_test.h" |
| 10 | 10 |
| 11 using testing::_; | 11 using testing::_; |
| (...skipping 24 matching lines...) Expand all Loading... |
| 36 TEST_P(ChromeFrameSitesTest, LoadSite) { | 36 TEST_P(ChromeFrameSitesTest, LoadSite) { |
| 37 // Print name of site for debugging purposes. | 37 // Print name of site for debugging purposes. |
| 38 std::wcout << L"Navigating to site: " << GetParam() << std::endl; | 38 std::wcout << L"Navigating to site: " << GetParam() << std::endl; |
| 39 | 39 |
| 40 // Verify navigation to the url passed in as parameter. | 40 // Verify navigation to the url passed in as parameter. |
| 41 EXPECT_CALL(ie_mock_, OnLoad(IN_CF, StrEq(GetParam()))) | 41 EXPECT_CALL(ie_mock_, OnLoad(IN_CF, StrEq(GetParam()))) |
| 42 .WillOnce(testing::DoAll( | 42 .WillOnce(testing::DoAll( |
| 43 VerifyAddressBarUrl(&ie_mock_), | 43 VerifyAddressBarUrl(&ie_mock_), |
| 44 CloseBrowserMock(&ie_mock_))); | 44 CloseBrowserMock(&ie_mock_))); |
| 45 | 45 |
| 46 LaunchIENavigateAndLoop(GetParam(), | 46 LaunchIENavigateAndLoop(GetParam(), kChromeFrameLongNavigationTimeout * 2); |
| 47 kChromeFrameLongNavigationTimeoutInSeconds * 2); | |
| 48 } | 47 } |
| 49 | 48 |
| 50 } // namespace chrome_frame_test | 49 } // namespace chrome_frame_test |
| OLD | NEW |