Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(178)

Unified Diff: media/base/pipeline_impl_unittest.cc

Issue 126170: Make the generated stubs weak. Enable the unittests that had conflicting symbols. (Closed)
Patch Set: Fix indent.w Created 11 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/base/mock_media_filters.h ('k') | media/base/video_frame_impl_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/base/pipeline_impl_unittest.cc
diff --git a/media/base/pipeline_impl_unittest.cc b/media/base/pipeline_impl_unittest.cc
index adfc3a65941585353605937549d44adfa7647327..f28ee1c99cafa72de3b36883d518bc90511d7d54 100644
--- a/media/base/pipeline_impl_unittest.cc
+++ b/media/base/pipeline_impl_unittest.cc
@@ -36,7 +36,7 @@ class PipelineImplTest : public testing::Test {
// was executed, false otherwise.
bool InitializeAndWait() {
DCHECK(!filters_);
- filters_ = new media::MockFilterFactory(&config_);
+ filters_ = new media::old_mocks::MockFilterFactory(&config_);
pipeline_.Start(filters_, "",
NewCallback(this, &PipelineImplTest::OnInitialize));
return initialize_event_.TimedWait(base::TimeDelta::FromMilliseconds(500));
@@ -51,8 +51,8 @@ class PipelineImplTest : public testing::Test {
// Fixture members.
media::PipelineImpl pipeline_;
- scoped_refptr<media::MockFilterFactory> filters_;
- media::MockFilterConfig config_;
+ scoped_refptr<media::old_mocks::MockFilterFactory> filters_;
+ media::old_mocks::MockFilterConfig config_;
bool initialize_result_;
bool seek_result_;
@@ -75,7 +75,7 @@ class PipelineImplTest : public testing::Test {
};
TEST_F(PipelineImplTest, NeverInitializes) {
- config_.data_source_behavior = media::MOCK_DATA_SOURCE_NEVER_INIT;
+ config_.data_source_behavior = media::old_mocks::MOCK_DATA_SOURCE_NEVER_INIT;
// This test hangs during initialization by never calling
// InitializationComplete(). Make sure we tear down the pipeline properly.
@@ -96,7 +96,8 @@ TEST_F(PipelineImplTest, RequiredFilterMissing) {
}
TEST_F(PipelineImplTest, URLNotFound) {
- config_.data_source_behavior = media::MOCK_DATA_SOURCE_URL_ERROR_IN_INIT;
+ config_.data_source_behavior =
+ media::old_mocks::MOCK_DATA_SOURCE_URL_ERROR_IN_INIT;
ASSERT_TRUE(InitializeAndWait());
EXPECT_FALSE(initialize_result_);
« no previous file with comments | « media/base/mock_media_filters.h ('k') | media/base/video_frame_impl_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698