chrome/browser/safe_browsing/safe_browsing_database.cc - Issue 18584011: Rename base::Delete to base::DeleteFile

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_database.cc

Issue 18584011: Rename base::Delete to base::DeleteFile (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 7 years, 5 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/download_feedback_service.cc ('k') | chrome/browser/safe_browsing/safe_browsing_database_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/safe_browsing/safe_browsing_database.cc

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

index ce2483c6c51f8ae322cf1b31b52b3b4a064fc0b7..dd1802fc87d38298d8aab6e68c26422eb8928d19 100644

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

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

@@ -1486,7 +1486,7 @@ void SafeBrowsingDatabaseNew::LoadPrefixSet() {

// TODO(shess): Track failure to delete?

base::FilePath bloom_filter_filename =

BloomFilterForFilename(browse_filename_);

- base::Delete(bloom_filter_filename, false);

+ base::DeleteFile(bloom_filter_filename, false);

const base::TimeTicks before = base::TimeTicks::Now();

browse_prefix_set_.reset(safe_browsing::PrefixSet::LoadFile(

@@ -1522,24 +1522,24 @@ bool SafeBrowsingDatabaseNew::Delete() {

base::FilePath bloom_filter_filename =

BloomFilterForFilename(browse_filename_);

- const bool r5 = base::Delete(bloom_filter_filename, false);

+ const bool r5 = base::DeleteFile(bloom_filter_filename, false);

if (!r5)

RecordFailure(FAILURE_DATABASE_FILTER_DELETE);

- const bool r6 = base::Delete(browse_prefix_set_filename_, false);

+ const bool r6 = base::DeleteFile(browse_prefix_set_filename_, false);

if (!r6)

RecordFailure(FAILURE_BROWSE_PREFIX_SET_DELETE);

- const bool r7 = base::Delete(extension_blacklist_filename_, false);

+ const bool r7 = base::DeleteFile(extension_blacklist_filename_, false);

if (!r7)

RecordFailure(FAILURE_EXTENSION_BLACKLIST_DELETE);

- const bool r8 = base::Delete(side_effect_free_whitelist_filename_,

+ const bool r8 = base::DeleteFile(side_effect_free_whitelist_filename_,

false);

if (!r8)

RecordFailure(FAILURE_SIDE_EFFECT_FREE_WHITELIST_DELETE);

- const bool r9 = base::Delete(

+ const bool r9 = base::DeleteFile(

side_effect_free_whitelist_prefix_set_filename_,

false);

if (!r9)