diff options
| author | jhawkins@chromium.org <jhawkins@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-28 01:55:03 +0000 |
|---|---|---|
| committer | jhawkins@chromium.org <jhawkins@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-28 01:55:03 +0000 |
| commit | a7ff313cda28cd6264f413bb7c50ad4016137a43 (patch) | |
| tree | fc3d52685ad1cb667177aef72adf50ecb08bd05a | |
| parent | ee335c3ef412ecbeb7251964b98c69662759d94c (diff) | |
| download | chromium_src-a7ff313cda28cd6264f413bb7c50ad4016137a43.zip chromium_src-a7ff313cda28cd6264f413bb7c50ad4016137a43.tar.gz chromium_src-a7ff313cda28cd6264f413bb7c50ad4016137a43.tar.bz2 | |
Fix the tree after r40232.
TBR=hclam
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/661254
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@40233 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | media/filters/decoder_base_unittest.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/media/filters/decoder_base_unittest.cc b/media/filters/decoder_base_unittest.cc index 49cc7ff..20b3e26 100644 --- a/media/filters/decoder_base_unittest.cc +++ b/media/filters/decoder_base_unittest.cc @@ -55,7 +55,7 @@ class MockDecoderImpl : public DecoderBase<MockDecoder, MockOutput> { MOCK_METHOD2(DoDecode, void(Buffer* input, Task* done_cb)); private: - FRIEND_TEST(DecoderBaseTest, FlowControl); + FRIEND_TEST(DecoderBaseTest, DISABLED_FlowControl); DISALLOW_COPY_AND_ASSIGN(MockDecoderImpl); }; |