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

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

Issue 3174027: Clean up the way top level navigations are handled in ChromeFrame and reporte... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 10 years, 4 months 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 | « chrome/renderer/render_view.cc ('k') | chrome_frame/test/test_with_web_server.cc » ('j') | 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 <string> 5 #include <string>
6 6
7 #include "base/scoped_comptr_win.h" 7 #include "base/scoped_comptr_win.h"
8 #include "chrome_frame/test/chrome_frame_test_utils.h" 8 #include "chrome_frame/test/chrome_frame_test_utils.h"
9 #include "chrome_frame/test/chrome_frame_ui_test_utils.h" 9 #include "chrome_frame/test/chrome_frame_ui_test_utils.h"
10 #include "chrome_frame/test/mock_ie_event_sink_actions.h" 10 #include "chrome_frame/test/mock_ie_event_sink_actions.h"
(...skipping 682 matching lines...) Expand 10 before | Expand all | Expand 10 after
693 693
694 std::wstring kUnloadEventMainUrl = 694 std::wstring kUnloadEventMainUrl =
695 GetTestUrl(L"fulltab_before_unload_event_main.html"); 695 GetTestUrl(L"fulltab_before_unload_event_main.html");
696 696
697 server_mock_.ExpectAndServeAnyRequests(GetParam()); 697 server_mock_.ExpectAndServeAnyRequests(GetParam());
698 InSequence expect_in_sequence_for_scope; 698 InSequence expect_in_sequence_for_scope;
699 699
700 ie_mock_.ExpectNavigation(in_cf, kUnloadEventTestUrl); 700 ie_mock_.ExpectNavigation(in_cf, kUnloadEventTestUrl);
701 EXPECT_CALL(ie_mock_, OnLoad(in_cf, StrEq(kUnloadEventTestUrl))); 701 EXPECT_CALL(ie_mock_, OnLoad(in_cf, StrEq(kUnloadEventTestUrl)));
702 702
703 ie_mock_.ExpectNavigation(in_cf, kUnloadEventMainUrl);
704 EXPECT_CALL(ie_mock_, OnLoad(in_cf, StrEq(kUnloadEventMainUrl))); 703 EXPECT_CALL(ie_mock_, OnLoad(in_cf, StrEq(kUnloadEventMainUrl)));
705 704
706 EXPECT_CALL(ie_mock_, OnMessage(_, _, _)) 705 EXPECT_CALL(ie_mock_, OnMessage(_, _, _))
707 .WillOnce(CloseBrowserMock(&ie_mock_)); 706 .WillOnce(CloseBrowserMock(&ie_mock_));
708 707
709 LaunchIEAndNavigate(kUnloadEventTestUrl); 708 LaunchIEAndNavigate(kUnloadEventTestUrl);
710 } 709 }
711 710
712 } // namespace chrome_frame_test 711 } // namespace chrome_frame_test
OLDNEW
« no previous file with comments | « chrome/renderer/render_view.cc ('k') | chrome_frame/test/test_with_web_server.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698