summaryrefslogtreecommitdiffstats
path: root/gpu
diff options
context:
space:
mode:
authorthakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-12-08 21:31:42 +0000
committerthakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-12-08 21:31:42 +0000
commita4f7378f973b38400f133958842eb36db0b61dcb (patch)
tree3ffb843e14698a63c4b5f1bac43cdcf1f4e1402e /gpu
parent76b4b15804dafa5e586738bd7c8ac12fea6ddec2 (diff)
downloadchromium_src-a4f7378f973b38400f133958842eb36db0b61dcb.zip
chromium_src-a4f7378f973b38400f133958842eb36db0b61dcb.tar.gz
chromium_src-a4f7378f973b38400f133958842eb36db0b61dcb.tar.bz2
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
Diffstat (limited to 'gpu')
-rw-r--r--gpu/tools/compositor_model_bench/compositor_model_bench.cc6
1 files changed, 4 insertions, 2 deletions
diff --git a/gpu/tools/compositor_model_bench/compositor_model_bench.cc b/gpu/tools/compositor_model_bench/compositor_model_bench.cc
index 3d788444..6c39981 100644
--- a/gpu/tools/compositor_model_bench/compositor_model_bench.cc
+++ b/gpu/tools/compositor_model_bench/compositor_model_bench.cc
@@ -38,7 +38,9 @@
using base::TimeTicks;
+using file_util::CloseFile;
using base::DirectoryExists;
+using file_util::OpenFile;
using base::PathExists;
using std::queue;
using std::string;
@@ -273,7 +275,7 @@ class Simulator {
void DumpOutput() {
LOG(INFO) << "Successfully ran " << sims_completed_.size() << " tests";
- FILE* f = base::OpenFile(output_path_, "w");
+ FILE* f = OpenFile(output_path_, "w");
if (!f) {
LOG(ERROR) << "Failed to open output file " <<
@@ -299,7 +301,7 @@ class Simulator {
}
fputs("\t]\n}", f);
- base::CloseFile(f);
+ CloseFile(f);
}
bool UpdateTestStatus() {