| OLD | NEW |
| 1 // Copyright (c) 2012 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 "base/utf_string_conversions.h" | 5 #include "base/utf_string_conversions.h" |
| 6 #include "content/browser/browser_thread_impl.h" | 6 #include "content/browser/browser_thread_impl.h" |
| 7 #include "content/browser/mock_content_browser_client.h" | 7 #include "content/browser/mock_content_browser_client.h" |
| 8 #include "content/browser/renderer_host/test_render_view_host.h" | 8 #include "content/browser/renderer_host/test_render_view_host.h" |
| 9 #include "content/browser/site_instance_impl.h" | 9 #include "content/browser/site_instance_impl.h" |
| 10 #include "content/browser/tab_contents/navigation_controller_impl.h" | |
| 11 #include "content/browser/tab_contents/navigation_entry_impl.h" | |
| 12 #include "content/browser/tab_contents/render_view_host_manager.h" | 10 #include "content/browser/tab_contents/render_view_host_manager.h" |
| 13 #include "content/browser/tab_contents/test_web_contents.h" | 11 #include "content/browser/tab_contents/test_web_contents.h" |
| 12 #include "content/browser/web_contents/navigation_entry_impl.h" |
| 13 #include "content/browser/web_contents/navigation_controller_impl.h" |
| 14 #include "content/common/test_url_constants.h" | 14 #include "content/common/test_url_constants.h" |
| 15 #include "content/common/view_messages.h" | 15 #include "content/common/view_messages.h" |
| 16 #include "content/public/browser/notification_details.h" | 16 #include "content/public/browser/notification_details.h" |
| 17 #include "content/public/browser/notification_source.h" | 17 #include "content/public/browser/notification_source.h" |
| 18 #include "content/public/browser/notification_types.h" | 18 #include "content/public/browser/notification_types.h" |
| 19 #include "content/public/browser/web_ui_controller.h" | 19 #include "content/public/browser/web_ui_controller.h" |
| 20 #include "content/public/browser/web_ui_controller_factory.h" | 20 #include "content/public/browser/web_ui_controller_factory.h" |
| 21 #include "content/public/common/page_transition_types.h" | 21 #include "content/public/common/page_transition_types.h" |
| 22 #include "content/public/common/url_constants.h" | 22 #include "content/public/common/url_constants.h" |
| 23 #include "content/test/mock_render_process_host.h" | 23 #include "content/test/mock_render_process_host.h" |
| (...skipping 739 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 763 | 763 |
| 764 // We should be able to navigate forward. | 764 // We should be able to navigate forward. |
| 765 contents()->GetController().GoForward(); | 765 contents()->GetController().GoForward(); |
| 766 contents()->ProceedWithCrossSiteNavigation(); | 766 contents()->ProceedWithCrossSiteNavigation(); |
| 767 const NavigationEntry* entry2 = contents()->GetController().GetPendingEntry(); | 767 const NavigationEntry* entry2 = contents()->GetController().GetPendingEntry(); |
| 768 rvh2->SendNavigate(entry2->GetPageID(), entry2->GetURL()); | 768 rvh2->SendNavigate(entry2->GetPageID(), entry2->GetURL()); |
| 769 EXPECT_EQ(rvh2, rvh()); | 769 EXPECT_EQ(rvh2, rvh()); |
| 770 EXPECT_FALSE(rvh2->is_swapped_out()); | 770 EXPECT_FALSE(rvh2->is_swapped_out()); |
| 771 EXPECT_TRUE(rvh1->is_swapped_out()); | 771 EXPECT_TRUE(rvh1->is_swapped_out()); |
| 772 } | 772 } |
| OLD | NEW |