Make the generated stubs weak. Enable the unittests that had conflicting symbols.

media/base/pipeline_impl_unittest.cc

 // Copyright (c) 2006-2009 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <string>
 
 #include "base/waitable_event.h"
 #include "media/base/pipeline_impl.h"
 #include "media/base/media_format.h"
 #include "media/base/filters.h"
@@ skipping 18 matching lines @@
   virtual void TearDown() {
     // Force the pipeline to shut down its thread.
     pipeline_.Stop();
   }
 
   // Called by tests after they have finished setting up MockFilterConfig.
   // Initializes the pipeline and returns true if the initialization callback
   // 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));
   }
 
   // Issues a seek on the pipeline and returns true if the seek callback was
   // executed, false otherwise.
   bool SeekAndWait(const base::TimeDelta& time) {
     pipeline_.Seek(time, NewCallback(this, &PipelineImplTest::OnSeek));
     return seek_event_.TimedWait(base::TimeDelta::FromMilliseconds(500));
   }
 
   // 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_;
 
  private:
   void OnInitialize(bool result) {
     initialize_result_ = result;
     initialize_event_.Signal();
   }
 
   void OnSeek(bool result) {
     seek_result_ = result;
     seek_event_.Signal();
   }
 
   // Used to wait for callbacks.
   base::WaitableEvent initialize_event_;
   base::WaitableEvent seek_event_;
 
   DISALLOW_COPY_AND_ASSIGN(PipelineImplTest);
 };
 
 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.
   ASSERT_FALSE(InitializeAndWait());
   EXPECT_FALSE(initialize_result_);
   EXPECT_FALSE(pipeline_.IsInitialized());
   EXPECT_EQ(media::PIPELINE_OK, pipeline_.GetError());
 }
 
 TEST_F(PipelineImplTest, RequiredFilterMissing) {
   config_.create_filter = false;
 
   ASSERT_TRUE(InitializeAndWait());
   EXPECT_FALSE(initialize_result_);
   EXPECT_FALSE(pipeline_.IsInitialized());
   EXPECT_EQ(media::PIPELINE_ERROR_REQUIRED_FILTER_MISSING,
             pipeline_.GetError());
 }
 
 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_);
   EXPECT_FALSE(pipeline_.IsInitialized());
   EXPECT_EQ(media::PIPELINE_ERROR_URL_NOT_FOUND, pipeline_.GetError());
 }
 
 TEST_F(PipelineImplTest, NoStreams) {
   config_.has_audio = false;
   config_.has_video = false;
@@ skipping 87 matching lines @@
   EXPECT_TRUE(expected == filters_->audio_renderer()->seek_time());
   EXPECT_TRUE(expected == filters_->video_decoder()->seek_time());
   EXPECT_TRUE(expected == filters_->video_renderer()->seek_time());
 }
 
 // TODO(ralphl): Add a unit test that makes sure that the mock audio filter
 // is actually called on a SetVolume() call to the pipeline.  I almost checked
 // in code that broke this, but all unit tests were passing.
 
 }  // namespace