diff options
| author | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-26 22:43:17 +0000 |
|---|---|---|
| committer | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-26 22:43:17 +0000 |
| commit | b23f28760aca31a1bb5e70b38e9c19d4cfaa87e6 (patch) | |
| tree | 08fe7a4ea5f93f4e11e077ce51b73ff5f3181f16 /media | |
| parent | 8415f89105df80ba5def99f4c02a45bc2552887d (diff) | |
| download | chromium_src-b23f28760aca31a1bb5e70b38e9c19d4cfaa87e6.zip chromium_src-b23f28760aca31a1bb5e70b38e9c19d4cfaa87e6.tar.gz chromium_src-b23f28760aca31a1bb5e70b38e9c19d4cfaa87e6.tar.bz2 | |
Fix a g++ 4.6 compiler issue in media/
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/10140013
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@134166 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media')
| -rw-r--r-- | media/base/pipeline_unittest.cc | 12 | ||||
| -rw-r--r-- | media/filters/ffmpeg_audio_decoder_unittest.cc | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/media/base/pipeline_unittest.cc b/media/base/pipeline_unittest.cc index 8ad3b1b..a18c55f 100644 --- a/media/base/pipeline_unittest.cc +++ b/media/base/pipeline_unittest.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include <string> +#include <vector> #include "base/bind.h" #include "base/message_loop.h" @@ -739,8 +739,8 @@ TEST_F(PipelineTest, ErrorDuringSeek) { EXPECT_CALL(*mocks_->demuxer(), Seek(seek_time, _)) .WillOnce(Invoke(&SendReadErrorToCB)); - pipeline_->Seek(seek_time,base::Bind(&CallbackHelper::OnSeek, - base::Unretained(&callbacks_))); + pipeline_->Seek(seek_time, base::Bind(&CallbackHelper::OnSeek, + base::Unretained(&callbacks_))); EXPECT_CALL(callbacks_, OnSeek(PIPELINE_ERROR_READ)); message_loop_.RunAllPending(); } @@ -787,8 +787,8 @@ TEST_F(PipelineTest, NoMessageDuringTearDownFromError) { EXPECT_CALL(*mocks_->demuxer(), Seek(seek_time, _)) .WillOnce(Invoke(&SendReadErrorToCB)); - pipeline_->Seek(seek_time,base::Bind(&CallbackHelper::OnSeek, - base::Unretained(&callbacks_))); + pipeline_->Seek(seek_time, base::Bind(&CallbackHelper::OnSeek, + base::Unretained(&callbacks_))); EXPECT_CALL(callbacks_, OnSeek(PIPELINE_ERROR_READ)); message_loop_.RunAllPending(); } @@ -849,7 +849,7 @@ TEST_F(PipelineTest, DemuxerProperties) { InitializePipeline(PIPELINE_OK); EXPECT_EQ(kLocalSource, pipeline_->IsLocalSource()); - EXPECT_EQ(!kSeekable, pipeline_->IsStreaming()); + EXPECT_NE(kSeekable, pipeline_->IsStreaming()); } class FlexibleCallbackRunner : public base::DelegateSimpleThread::Delegate { diff --git a/media/filters/ffmpeg_audio_decoder_unittest.cc b/media/filters/ffmpeg_audio_decoder_unittest.cc index 65d2c7f..cbd1b10 100644 --- a/media/filters/ffmpeg_audio_decoder_unittest.cc +++ b/media/filters/ffmpeg_audio_decoder_unittest.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include <queue> +#include <deque> #include "base/bind.h" #include "base/message_loop.h" |