diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-07-07 11:39:03 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-07-07 10:30:25 +0000 |
| commit | b80be2a302fe1e662a4a2b269d7ee8b7875581df (patch) | |
| tree | 3a6e79ab9bc38ff554f77127b250edde8e476119 /chromium/media/ffmpeg | |
| parent | 813fbf95af77a531c57a8c497345ad2c61d475b3 (diff) | |
| download | qtwebengine-chromium-b80be2a302fe1e662a4a2b269d7ee8b7875581df.tar.gz | |
BASELINE: Update to chromium 44.0.2403.80
Change-Id: Ib190ddcbbb5f312742c16d159bdfe9dbf7360c8a
Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
Diffstat (limited to 'chromium/media/ffmpeg')
| -rw-r--r-- | chromium/media/ffmpeg/ffmpeg_common_unittest.cc | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/chromium/media/ffmpeg/ffmpeg_common_unittest.cc b/chromium/media/ffmpeg/ffmpeg_common_unittest.cc index ff0730732f9..47c3db36ce1 100644 --- a/chromium/media/ffmpeg/ffmpeg_common_unittest.cc +++ b/chromium/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,9 @@ namespace media { class FFmpegCommonTest : public testing::Test { public: - FFmpegCommonTest() { FFmpegGlue::InitializeFFmpeg(); } + FFmpegCommonTest() { + FFmpegGlue::InitializeFFmpeg(); + } ~FFmpegCommonTest() override{}; }; @@ -89,17 +92,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[] = { "", |