Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(365)

Unified Diff: trunk/src/chrome/browser/safe_browsing/safe_browsing_store_file.cc

Issue 105823009: Revert 239280 "Move more file_util functions to base namespace." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 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
Index: trunk/src/chrome/browser/safe_browsing/safe_browsing_store_file.cc
===================================================================
--- trunk/src/chrome/browser/safe_browsing/safe_browsing_store_file.cc (revision 239399)
+++ trunk/src/chrome/browser/safe_browsing/safe_browsing_store_file.cc (working copy)
@@ -292,7 +292,7 @@
bool SafeBrowsingStoreFile::GetAddPrefixes(SBAddPrefixes* add_prefixes) {
add_prefixes->clear();
- file_util::ScopedFILE file(base::OpenFile(filename_, "rb"));
+ file_util::ScopedFILE file(file_util::OpenFile(filename_, "rb"));
if (file.get() == NULL) return false;
FileHeader header;
@@ -314,7 +314,7 @@
std::vector<SBAddFullHash>* add_full_hashes) {
add_full_hashes->clear();
- file_util::ScopedFILE file(base::OpenFile(filename_, "rb"));
+ file_util::ScopedFILE file(file_util::OpenFile(filename_, "rb"));
if (file.get() == NULL) return false;
FileHeader header;
@@ -397,11 +397,11 @@
corruption_seen_ = false;
const base::FilePath new_filename = TemporaryFileForFilename(filename_);
- file_util::ScopedFILE new_file(base::OpenFile(new_filename, "wb+"));
+ file_util::ScopedFILE new_file(file_util::OpenFile(new_filename, "wb+"));
if (new_file.get() == NULL)
return false;
- file_util::ScopedFILE file(base::OpenFile(filename_, "rb"));
+ file_util::ScopedFILE file(file_util::OpenFile(filename_, "rb"));
empty_ = (file.get() == NULL);
if (empty_) {
// If the file exists but cannot be opened, try to delete it (not
@@ -644,7 +644,7 @@
return false;
// Trim any excess left over from the temporary chunk data.
- if (!base::TruncateFile(new_file_.get()))
+ if (!file_util::TruncateFile(new_file_.get()))
return false;
// Close the file handle and swizzle the file into place.

Powered by Google App Engine
This is Rietveld 408576698