chrome/browser/safe_browsing/safe_browsing_blocking_page_unittest.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/safe_browsing/safe_browsing_blocking_page_unittest.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/safe_browsing/safe_browsing_blocking_page_test.cc ('k') | chrome/browser/safe_browsing/safe_browsing_service.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/safe_browsing/safe_browsing_blocking_page_unittest.cc

diff --git a/chrome/browser/safe_browsing/safe_browsing_blocking_page_unittest.cc b/chrome/browser/safe_browsing/safe_browsing_blocking_page_unittest.cc

index a6c27047cc49ef956621883d675f456d6d437b25..fec45140a7c17467c382b807a32f7e13bd52b281 100644

--- a/chrome/browser/safe_browsing/safe_browsing_blocking_page_unittest.cc

+++ b/chrome/browser/safe_browsing/safe_browsing_blocking_page_unittest.cc

@@ -115,9 +115,9 @@ class SafeBrowsingBlockingPageTest : public ChromeRenderViewHostTestHarness,

}

void GoBack(bool is_cross_site) {

- NavigationEntry* entry = contents()->GetController().GetEntryAtOffset(-1);

+ NavigationEntry* entry = contents()->controller().GetEntryAtOffset(-1);

ASSERT_TRUE(entry);

- contents()->GetController().GoBack();

+ contents()->controller().GoBack();

// The pending RVH should commit for cross-site navigations.

RenderViewHost* rvh = is_cross_site ?

@@ -493,7 +493,7 @@ TEST_F(SafeBrowsingBlockingPageTest, NavigatingBackAndForth) {

EXPECT_EQ(kGoodURL, controller().GetActiveEntry()->url().spec());

// Navigate forward to the malware URL.

- contents()->GetController().GoForward();

+ contents()->controller().GoForward();

ShowInterstitial(false, kBadURL);

sb_interstitial = GetSafeBrowsingBlockingPage();

ASSERT_TRUE(sb_interstitial);