summaryrefslogtreecommitdiffstats
path: root/content/gpu
diff options
context:
space:
mode:
authorthakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-12-08 21:43:30 +0000
committerthakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-12-08 21:43:30 +0000
commit7600d0b2d5e37b211280d5109a6b726644d6be76 (patch)
tree4ba2cb5383bb9ef5f610aeffe5d4455149da683b /content/gpu
parenta4f7378f973b38400f133958842eb36db0b61dcb (diff)
downloadchromium_src-7600d0b2d5e37b211280d5109a6b726644d6be76.zip
chromium_src-7600d0b2d5e37b211280d5109a6b726644d6be76.tar.gz
chromium_src-7600d0b2d5e37b211280d5109a6b726644d6be76.tar.bz2
Revert 239400 "Revert 239280 "Move more file_util functions to b..."
Broke all bots 9_9 > 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 TBR=thakis@chromium.org Review URL: https://codereview.chromium.org/100923007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@239401 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/gpu')
-rw-r--r--content/gpu/gpu_watchdog_thread.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/content/gpu/gpu_watchdog_thread.cc b/content/gpu/gpu_watchdog_thread.cc
index b644aec..940d07e 100644
--- a/content/gpu/gpu_watchdog_thread.cc
+++ b/content/gpu/gpu_watchdog_thread.cc
@@ -57,7 +57,7 @@ GpuWatchdogThread::GpuWatchdogThread(int timeout)
#endif
#if defined(OS_CHROMEOS)
- tty_file_ = file_util::OpenFile(base::FilePath(kTtyFilePath), "r");
+ tty_file_ = base::OpenFile(base::FilePath(kTtyFilePath), "r");
#endif
watched_message_loop_->AddTaskObserver(&task_observer_);
}