chrome/browser/ui/pdf/pdf_browsertest.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/ui/pdf/pdf_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/ui/login/login_prompt_browsertest.cc ('k') | chrome/browser/ui/search_engines/search_engine_tab_helper.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/pdf/pdf_browsertest.cc

diff --git a/chrome/browser/ui/pdf/pdf_browsertest.cc b/chrome/browser/ui/pdf/pdf_browsertest.cc

index 1d9d768a17a70847a47f6c717be8b51c6f0c4619..00616277ce59b3f6a2dd22b681de3b1ce257e097 100644

--- a/chrome/browser/ui/pdf/pdf_browsertest.cc

+++ b/chrome/browser/ui/pdf/pdf_browsertest.cc

@@ -282,7 +282,7 @@ IN_PROC_BROWSER_TEST_F(PDFBrowserTest, FLAKY_SLOW_Loading) {

ASSERT_TRUE(pdf_test_server()->Start());

NavigationController* controller =

- &(browser()->GetSelectedTabContents()->GetController());

+ &(browser()->GetSelectedTabContents()->controller());

content::NotificationRegistrar registrar;

registrar.Add(this,

content::NOTIFICATION_LOAD_STOP,

@@ -348,7 +348,7 @@ IN_PROC_BROWSER_TEST_F(PDFBrowserTest, MAYBE_OnLoadAndReload) {

ui_test_utils::WindowedNotificationObserver observer(

content::NOTIFICATION_LOAD_STOP,

content::Source<NavigationController>(

- &browser()->GetSelectedTabContents()->GetController()));

+ &browser()->GetSelectedTabContents()->controller()));

ASSERT_TRUE(ui_test_utils::ExecuteJavaScript(

browser()->GetSelectedTabContents()->GetRenderViewHost(),

std::wstring(),