diff options
| author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-08 21:43:30 +0000 |
|---|---|---|
| committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-08 21:43:30 +0000 |
| commit | 7600d0b2d5e37b211280d5109a6b726644d6be76 (patch) | |
| tree | 4ba2cb5383bb9ef5f610aeffe5d4455149da683b /content/renderer/media | |
| parent | a4f7378f973b38400f133958842eb36db0b61dcb (diff) | |
| download | chromium_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/renderer/media')
| -rw-r--r-- | content/renderer/media/media_stream_audio_processor_unittest.cc | 2 | ||||
| -rw-r--r-- | content/renderer/media/webrtc_audio_device_unittest.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/content/renderer/media/media_stream_audio_processor_unittest.cc b/content/renderer/media/media_stream_audio_processor_unittest.cc index 79311c8..1a6409c 100644 --- a/content/renderer/media/media_stream_audio_processor_unittest.cc +++ b/content/renderer/media/media_stream_audio_processor_unittest.cc @@ -46,7 +46,7 @@ void ReadDataFromSpeechFile(char* data, int length) { DCHECK(base::PathExists(file)); int64 data_file_size64 = 0; DCHECK(base::GetFileSize(file, &data_file_size64)); - EXPECT_EQ(length, file_util::ReadFile(file, data, length)); + EXPECT_EQ(length, base::ReadFile(file, data, length)); DCHECK(data_file_size64 > length); } diff --git a/content/renderer/media/webrtc_audio_device_unittest.cc b/content/renderer/media/webrtc_audio_device_unittest.cc index 5e111a5..73f0885 100644 --- a/content/renderer/media/webrtc_audio_device_unittest.cc +++ b/content/renderer/media/webrtc_audio_device_unittest.cc @@ -296,7 +296,7 @@ void ReadDataFromSpeechFile(char* data, int length) { DCHECK(base::PathExists(data_file)); int64 data_file_size64 = 0; DCHECK(base::GetFileSize(data_file, &data_file_size64)); - EXPECT_EQ(length, file_util::ReadFile(data_file, data, length)); + EXPECT_EQ(length, base::ReadFile(data_file, data, length)); DCHECK(data_file_size64 > length); } |