From a4f7378f973b38400f133958842eb36db0b61dcb Mon Sep 17 00:00:00 2001 From: "thakis@chromium.org" Date: Sun, 8 Dec 2013 21:31:42 +0000 Subject: Revert 239280 "Move more file_util functions to base namespace." dbus_unittests started fialing on Linux Tests (dbg)(2) and Linux Tests (dbg)(2)(32). This CL is the only in the intersection of CLs in the first failing build on the two builders, so giving a speculative revert a try (rlarocque already tried a clobber, it didn't help). http://build.chromium.org/p/chromium.linux/builders/Linux%20Tests%20%28dbg%29%282%29/builds/41806 http://build.chromium.org/p/chromium.linux/builders/Linux%20Tests%20%28dbg%29%282%29%2832%29/builds/8544 > Move more file_util functions to base namespace. > > TBR=sky > > Review URL: https://codereview.chromium.org/109043002 TBR=brettw@chromium.org Review URL: https://codereview.chromium.org/105823009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@239400 0039d316-1c4b-4281-b951-d872f2087c98 --- components/visitedlink/browser/visitedlink_master.cc | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'components/visitedlink') diff --git a/components/visitedlink/browser/visitedlink_master.cc b/components/visitedlink/browser/visitedlink_master.cc index f4e3e2a..7cf6891 100644 --- a/components/visitedlink/browser/visitedlink_master.cc +++ b/components/visitedlink/browser/visitedlink_master.cc @@ -31,6 +31,8 @@ using content::BrowserThread; using file_util::ScopedFILE; +using file_util::OpenFile; +using file_util::TruncateFile; namespace visitedlink { @@ -66,7 +68,7 @@ void GenerateSalt(uint8 salt[LINK_SALT_LENGTH]) { // Opens file on a background thread to not block UI thread. void AsyncOpen(FILE** file, const base::FilePath& filename) { - *file = base::OpenFile(filename, "wb+"); + *file = OpenFile(filename, "wb+"); DLOG_IF(ERROR, !(*file)) << "Failed to open file " << filename.value(); } @@ -103,7 +105,7 @@ void AsyncWrite(FILE** file, int32 offset, const std::string& data) { // by the time of scheduling the task for execution. void AsyncTruncate(FILE** file) { if (*file) - base::IgnoreResult(base::TruncateFile(*file)); + base::IgnoreResult(TruncateFile(*file)); } // Closes the file on a background thread and releases memory used for storage @@ -540,7 +542,7 @@ bool VisitedLinkMaster::InitFromFile() { base::FilePath filename; GetDatabaseFileName(&filename); - ScopedFILE file_closer(base::OpenFile(filename, "rb+")); + ScopedFILE file_closer(OpenFile(filename, "rb+")); if (!file_closer.get()) return false; -- cgit v1.1