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

media/filters/ffmpeg_video_decoder_unittest.cc

Index: media/filters/ffmpeg_video_decoder_unittest.cc
diff --git a/media/filters/ffmpeg_video_decoder_unittest.cc b/media/filters/ffmpeg_video_decoder_unittest.cc
index 7cb0d7bcad29d757007e367676a1ff7c0e299161..a00626d85dc2bbebe7b1de286b3f54782c287e72 100644
--- a/media/filters/ffmpeg_video_decoder_unittest.cc
+++ b/media/filters/ffmpeg_video_decoder_unittest.cc
@@ -94,8 +94,8 @@ namespace media {
 // FFmpeg, pipeline and filter host mocks.
 class FFmpegVideoDecoderTest : public testing::Test {
  protected:
-  static const int kWidth = 1280;
-  static const int kHeight = 720;
+  static const int kWidth;
+  static const int kHeight;
 
   FFmpegVideoDecoderTest() {
     MediaFormat media_format;
@@ -136,7 +136,7 @@ class FFmpegVideoDecoderTest : public testing::Test {
   scoped_refptr<FilterFactory> factory_;
   scoped_refptr<VideoDecoder> decoder_;
   scoped_ptr<MockPipeline> pipeline_;
-  scoped_ptr< MockFilterHost<VideoDecoder> > filter_host_;
+  scoped_ptr<MockFilterHost<VideoDecoder> > filter_host_;
   scoped_refptr<MockDemuxerStream> demuxer_;
 
   // FFmpeg fixtures.
@@ -149,6 +149,9 @@ class FFmpegVideoDecoderTest : public testing::Test {
   DISALLOW_COPY_AND_ASSIGN(FFmpegVideoDecoderTest);
 };
 
+const int FFmpegVideoDecoderTest::kWidth = 1280;
+const int FFmpegVideoDecoderTest::kHeight = 720;
+
 TEST(FFmpegVideoDecoderFactoryTest, Create) {
   // Should only accept video/x-ffmpeg mime type.
   scoped_refptr<FilterFactory> factory = FFmpegVideoDecoder::CreateFactory();
@@ -169,7 +172,7 @@ TEST(FFmpegVideoDecoderFactoryTest, Create) {
 TEST_F(FFmpegVideoDecoderTest, Initialize_QueryInterfaceFails) {
   // Test QueryInterface returning NULL.
   EXPECT_CALL(*demuxer_, QueryInterface(AVStreamProvider::interface_id()))
-    .WillOnce(ReturnNull());
+      .WillOnce(ReturnNull());
 
   EXPECT_FALSE(decoder_->Initialize(demuxer_));
   EXPECT_TRUE(filter_host_->WaitForError(PIPELINE_ERROR_DECODE));