summaryrefslogtreecommitdiffstats
path: root/media/audio/android
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 /media/audio/android
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 'media/audio/android')
-rw-r--r--media/audio/android/audio_android_unittest.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/media/audio/android/audio_android_unittest.cc b/media/audio/android/audio_android_unittest.cc
index 00d1f90..300e154 100644
--- a/media/audio/android/audio_android_unittest.cc
+++ b/media/audio/android/audio_android_unittest.cc
@@ -218,7 +218,7 @@ class FileAudioSink : public AudioInputStream::AudioInputCallback {
base::FilePath file_path;
EXPECT_TRUE(PathService::Get(base::DIR_SOURCE_ROOT, &file_path));
file_path = file_path.AppendASCII(file_name.c_str());
- binary_file_ = file_util::OpenFile(file_path, "wb");
+ binary_file_ = base::OpenFile(file_path, "wb");
DLOG_IF(ERROR, !binary_file_) << "Failed to open binary PCM data file.";
VLOG(0) << "Writing to file: " << file_path.value().c_str();
}
@@ -239,7 +239,7 @@ class FileAudioSink : public AudioInputStream::AudioInputCallback {
buffer_->Seek(chunk_size);
bytes_written += chunk_size;
}
- file_util::CloseFile(binary_file_);
+ base::CloseFile(binary_file_);
}
// AudioInputStream::AudioInputCallback implementation.