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

Unified Diff: chrome/browser/prerender/prerender_browsertest.cc

Issue 9018016: Revert r115276, it broke PanelDownloadTest.Download in interactive_ui_tests (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/password_manager_delegate_impl.cc ('k') | chrome/browser/prerender/prerender_contents.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/prerender/prerender_browsertest.cc
diff --git a/chrome/browser/prerender/prerender_browsertest.cc b/chrome/browser/prerender/prerender_browsertest.cc
index d26ce9e5e67b59ed4a2d35547e4ced86833dbc06..cdea761bd32019ad047ef9eeec638c3478c87fb8 100644
--- a/chrome/browser/prerender/prerender_browsertest.cc
+++ b/chrome/browser/prerender/prerender_browsertest.cc
@@ -584,7 +584,7 @@ class PrerenderBrowserTest : public InProcessBrowserTest {
EXPECT_FALSE(tab->IsLoading());
ui_test_utils::WindowedNotificationObserver back_nav_observer(
content::NOTIFICATION_LOAD_STOP,
- content::Source<NavigationController>(&tab->GetController()));
+ content::Source<NavigationController>(&tab->controller()));
browser->GoBack(CURRENT_TAB);
back_nav_observer.Wait();
bool js_result;
@@ -763,7 +763,7 @@ class PrerenderBrowserTest : public InProcessBrowserTest {
new ui_test_utils::WindowedNotificationObserver(
content::NOTIFICATION_LOAD_STOP,
content::Source<NavigationController>(
- &tab_contents->GetController())));
+ &tab_contents->controller())));
}
// ui_test_utils::NavigateToURL waits until DidStopLoading is called on
@@ -1351,7 +1351,7 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderRendererCrash) {
// Navigate to about:crash and then wait for the renderer to crash.
ASSERT_TRUE(GetPrerenderContents());
ASSERT_TRUE(GetPrerenderContents()->prerender_contents());
- GetPrerenderContents()->prerender_contents()->tab_contents()->GetController().
+ GetPrerenderContents()->prerender_contents()->tab_contents()->controller().
LoadURL(
GURL(chrome::kAboutCrashURL),
content::Referrer(),
« no previous file with comments | « chrome/browser/password_manager_delegate_impl.cc ('k') | chrome/browser/prerender/prerender_contents.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698