OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 "chrome/browser/browser_thread.h" | 5 #include "chrome/browser/browser_thread.h" |
6 #include "chrome/browser/browser_url_handler.h" | 6 #include "chrome/browser/browser_url_handler.h" |
7 #include "chrome/browser/renderer_host/site_instance.h" | 7 #include "chrome/browser/renderer_host/site_instance.h" |
8 #include "chrome/browser/renderer_host/test/test_render_view_host.h" | 8 #include "chrome/browser/renderer_host/test/test_render_view_host.h" |
9 #include "chrome/browser/tab_contents/navigation_controller.h" | 9 #include "chrome/browser/tab_contents/navigation_controller.h" |
10 #include "chrome/browser/tab_contents/navigation_entry.h" | 10 #include "chrome/browser/tab_contents/navigation_entry.h" |
(...skipping 325 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
336 // That should have cancelled the pending RVH, and the evil RVH should be the | 336 // That should have cancelled the pending RVH, and the evil RVH should be the |
337 // current one. | 337 // current one. |
338 EXPECT_TRUE(contents()->render_manager()->pending_render_view_host() == NULL); | 338 EXPECT_TRUE(contents()->render_manager()->pending_render_view_host() == NULL); |
339 EXPECT_EQ(evil_rvh, contents()->render_manager()->current_host()); | 339 EXPECT_EQ(evil_rvh, contents()->render_manager()->current_host()); |
340 | 340 |
341 // Also we should not have a pending navigation entry. | 341 // Also we should not have a pending navigation entry. |
342 NavigationEntry* entry = contents()->controller().GetActiveEntry(); | 342 NavigationEntry* entry = contents()->controller().GetActiveEntry(); |
343 ASSERT_TRUE(entry != NULL); | 343 ASSERT_TRUE(entry != NULL); |
344 EXPECT_EQ(url2, entry->url()); | 344 EXPECT_EQ(url2, entry->url()); |
345 } | 345 } |
OLD | NEW |