diff options
| author | nsylvain@chromium.org <nsylvain@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-12 01:13:27 +0000 |
|---|---|---|
| committer | nsylvain@chromium.org <nsylvain@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-12 01:13:27 +0000 |
| commit | 7712c3f67657e15d8702ffdd2b6a761c7bca25b1 (patch) | |
| tree | 093931804895d2a1d33a0d5ef1c6c077814a3373 /chrome/gpu | |
| parent | dcafaefb3097412bacafb3c248149f427e6b0fcc (diff) | |
| download | chromium_src-7712c3f67657e15d8702ffdd2b6a761c7bca25b1.zip chromium_src-7712c3f67657e15d8702ffdd2b6a761c7bca25b1.tar.gz chromium_src-7712c3f67657e15d8702ffdd2b6a761c7bca25b1.tar.bz2 | |
Revert 74700 - Revert the "out-of-lining of test code" change within src/media
to see if it fixes the gmock crashes we've been seeing since the
change has been made.
The original change was split between r74660, r74168, r74059
Review URL: http://codereview.chromium.org/6473006
TBR=nsylvain@chromium.org
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@74712 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/gpu')
| -rw-r--r-- | chrome/gpu/gpu_video_decoder_unittest.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/gpu/gpu_video_decoder_unittest.cc b/chrome/gpu/gpu_video_decoder_unittest.cc index 41e88d3..7767dcd 100644 --- a/chrome/gpu/gpu_video_decoder_unittest.cc +++ b/chrome/gpu/gpu_video_decoder_unittest.cc @@ -8,7 +8,7 @@ #include "chrome/gpu/gpu_video_decoder.h" #include "gpu/command_buffer/service/gles2_cmd_decoder_mock.h" #include "ipc/ipc_message_utils.h" -#include "media/video/mock_objects.h" +#include "media/video/video_mock_objects.h" #include "testing/gtest/include/gtest/gtest.h" using testing::_; |