chrome/browser/safe_browsing/safe_browsing_blocking_page_unittest.cc - Issue 2852333003: Rename SafeBrowsingErrorUI to SafeBrowsingLoudErrorUI

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 2852333003: Rename SafeBrowsingErrorUI to SafeBrowsingLoudErrorUI (Closed)

Patch Set: Fix merge conflict Created 3 years, 7 months 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/ui_manager_unittest.cc » ('j') | components/security_interstitials/core/base_safe_browsing_error_ui.h » ('J')
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 002d9be8f25f2240a644c859c8a2fe2ad9e42b06..5690dac0145b2484c15228bf02fd6d507c2a3bdb 100644

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

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

@@ -29,7 +29,7 @@ using content::InterstitialPage;

using content::NavigationEntry;

using content::WebContents;

using content::WebContentsTester;

-using security_interstitials::SafeBrowsingErrorUI;

+using security_interstitials::BaseSafeBrowsingErrorUI;

static const char* kGoogleURL = "http://www.google.com/";

static const char* kGoodURL = "http://www.goodguys.com/";

@@ -49,7 +49,7 @@ class TestSafeBrowsingBlockingPage : public SafeBrowsingBlockingPage {

WebContents* web_contents,

const GURL& main_frame_url,

const UnsafeResourceList& unsafe_resources,

- const SafeBrowsingErrorUI::SBErrorDisplayOptions& display_options)

+ const BaseSafeBrowsingErrorUI::SBErrorDisplayOptions& display_options)

: SafeBrowsingBlockingPage(manager,

web_contents,

main_frame_url,

@@ -80,7 +80,7 @@ class TestSafeBrowsingBlockingPageFactory

prefs->GetBoolean(prefs::kSafeBrowsingExtendedReportingOptInAllowed);

bool is_proceed_anyway_disabled =

prefs->GetBoolean(prefs::kSafeBrowsingProceedAnywayDisabled);

- SafeBrowsingErrorUI::SBErrorDisplayOptions display_options(

+ BaseSafeBrowsingErrorUI::SBErrorDisplayOptions display_options(

BaseBlockingPage::IsMainPageLoadBlocked(unsafe_resources),

is_extended_reporting_opt_in_allowed,

web_contents->GetBrowserContext()->IsOffTheRecord(),