Refactor some code that depends on FFmpeg

media/filters/bitstream_converter_unittest.cc

-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 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 <deque>
 
 #include "media/base/mock_ffmpeg.h"
+#include "media/ffmpeg/ffmpeg_common.h"
 #include "media/filters/bitstream_converter.h"
-#include "media/filters/ffmpeg_common.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using ::testing::DoAll;
 using ::testing::Mock;
 using ::testing::Return;
 using ::testing::ReturnNull;
 using ::testing::SetArgumentPointee;
 using ::testing::StrEq;
 using ::testing::StrictMock;
 using ::testing::_;
@@ skipping 140 matching lines @@
   EXPECT_EQ(kData1, test_packet_.data);
   EXPECT_EQ(kTestSize1, test_packet_.size);
   EXPECT_TRUE(test_packet_.destruct == NULL);
 
   // Uninject mock filter instance to avoid cleanup code on destruction of
   // converter.
   converter.stream_filter_ = NULL;
 }
 
 }  // namespace media