Chromium changes for static linking ffmpeg

media/ffmpeg/ffmpeg_common_unittest.cc

Index: media/ffmpeg/ffmpeg_common_unittest.cc
diff --git a/media/ffmpeg/ffmpeg_common_unittest.cc b/media/ffmpeg/ffmpeg_common_unittest.cc
index ff0730732f9ced51c69398c1812ea5bbb5342ba0..c45e22fc06d4b0643b12864ed1171c6c6597d0b1 100644
--- a/media/ffmpeg/ffmpeg_common_unittest.cc
+++ b/media/ffmpeg/ffmpeg_common_unittest.cc
@@ -4,6 +4,7 @@
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
+#include "media/base/media.h"
 #include "media/ffmpeg/ffmpeg_common.h"
 #include "media/filters/ffmpeg_glue.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ -12,7 +13,10 @@ namespace media {
 
 class FFmpegCommonTest : public testing::Test {
  public:
-  FFmpegCommonTest() { FFmpegGlue::InitializeFFmpeg(); }
+  FFmpegCommonTest() {
+    InitializeMediaLibrary();

[DaleCurtis, 2015/06/02 18:21:07]

Shouldn't be necessary?

[chcunningham, 2015/06/03 01:14:16]

Done.

+    FFmpegGlue::InitializeFFmpeg();
+  }
   ~FFmpegCommonTest() override{};
 };
 
@@ -89,17 +93,6 @@ TEST_F(FFmpegCommonTest, UTCDateToTime_Valid) {
   EXPECT_EQ(0, exploded.millisecond);
 }
 
-#if defined(ALLOCATOR_SHIM) && defined(GTEST_HAS_DEATH_TEST)
-TEST_F(FFmpegCommonTest, WinAllocatorShimDeathTest) {
-  scoped_ptr<char, base::FreeDeleter> ptr;
-  // INT_MAX - 128 is carefully chosen to be below the default limit for
-  // ffmpeg allocations, but above the maximum allowed limit by the allocator
-  // shim, so we can be certain the code is being hit.
-  EXPECT_DEATH(ptr.reset(static_cast<char*>(av_malloc(INT_MAX - 128))), "");
-  ASSERT_TRUE(!ptr);
-}
-#endif
-
 TEST_F(FFmpegCommonTest, UTCDateToTime_Invalid) {
   const char* invalid_date_strings[] = {
     "",