chrome/browser/extensions/extension_browsertests_misc.cc - Issue 9018016: Revert r115276, it broke PanelDownloadTest.Download in interactive_ui_tests

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/extensions/extension_browsertests_misc.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/extensions/extension_browser_event_router.cc ('k') | chrome/browser/extensions/extension_crash_recovery_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/extension_browsertests_misc.cc

diff --git a/chrome/browser/extensions/extension_browsertests_misc.cc b/chrome/browser/extensions/extension_browsertests_misc.cc

index 4eb7a125af974e0be13b2279f2f0334163d7bbce..a044667202e5c950c3cb57f7d307bc00da778e48 100644

--- a/chrome/browser/extensions/extension_browsertests_misc.cc

+++ b/chrome/browser/extensions/extension_browsertests_misc.cc

@@ -702,7 +702,7 @@ static void WindowOpenHelper(Browser* browser, const GURL& start_url,

GURL expected_url = start_url.Resolve(newtab_url);

observer.Wait();

EXPECT_EQ(expected_url,

- newtab->GetController().GetLastCommittedEntry()->url());

+ newtab->controller().GetLastCommittedEntry()->url());

if (newtab_result)

*newtab_result = newtab;

}

@@ -811,7 +811,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, MAYBE_PluginLoadUnload) {

content::NOTIFICATION_LOAD_STOP,

content::Source<NavigationController>(

&browser()->GetSelectedTabContentsWrapper()->tab_contents()->

- GetController()));

+ controller()));

browser()->Reload(CURRENT_TAB);

observer.Wait();

}

@@ -838,7 +838,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, MAYBE_PluginLoadUnload) {

content::NOTIFICATION_LOAD_STOP,

content::Source<NavigationController>(

&browser()->GetSelectedTabContentsWrapper()->tab_contents()->

- GetController()));

+ controller()));

browser()->Reload(CURRENT_TAB);

observer.Wait();

}