chrome/browser/safe_browsing/protocol_manager.cc - Issue 1420123003: Move more declarations from c/b/sb/sb_util.h to components.

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/protocol_manager.cc

Issue 1420123003: Move more declarations from c/b/sb/sb_util.h to components. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@01_components

Patch Set: Minor: Replace safe_browsing_util:: with safe_browsing:: and use safe_browsing:: namespace prefix Created 5 years, 1 month 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/local_database_manager_unittest.cc ('k') | chrome/browser/safe_browsing/protocol_manager_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/safe_browsing/protocol_manager.cc

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

index 745a9d7fb19accfe351db101641b30a5d4ba21ae..658453b666c42ead3a3373358dd75f8c08ce8a5b 100644

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

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

@@ -18,6 +18,7 @@

#include "base/timer/timer.h"

#include "chrome/browser/safe_browsing/protocol_parser.h"

#include "chrome/common/env_vars.h"

+#include "components/safe_browsing_db/util.h"

#include "components/variations/variations_associated_data.h"

#include "google_apis/google_api_keys.h"

#include "net/base/escape.h"

@@ -631,10 +632,10 @@ void SafeBrowsingProtocolManager::OnGetChunksComplete(

bool found_phishing = false;

for (size_t i = 0; i < lists.size(); ++i) {

update_list_data_.append(safe_browsing::FormatList(lists[i]));

- if (lists[i].name == safe_browsing_util::kPhishingList)

+ if (lists[i].name == safe_browsing::kPhishingList)

found_phishing = true;

- if (lists[i].name == safe_browsing_util::kMalwareList)

+ if (lists[i].name == safe_browsing::kMalwareList)

found_malware = true;

}

@@ -645,11 +646,11 @@ void SafeBrowsingProtocolManager::OnGetChunksComplete(

// removed.

if (!found_phishing) {

update_list_data_.append(safe_browsing::FormatList(

- SBListChunkRanges(safe_browsing_util::kPhishingList)));

+ SBListChunkRanges(safe_browsing::kPhishingList)));

}

if (!found_malware) {

update_list_data_.append(safe_browsing::FormatList(

- SBListChunkRanges(safe_browsing_util::kMalwareList)));

+ SBListChunkRanges(safe_browsing::kMalwareList)));

}

// Large requests are (probably) a sign of database corruption.