Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(82)

Side by Side Diff: media/filters/chunk_demuxer_unittest.cc

Issue 1302233003: Replace gmock's deprecated SetArgumentPointee with SetArgPointee. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 2017 Created 3 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « media/audio/cras/cras_unified_unittest.cc ('k') | media/filters/ffmpeg_glue_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "media/filters/chunk_demuxer.h" 5 #include "media/filters/chunk_demuxer.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 #include <stdint.h> 8 #include <stdint.h>
9 #include <algorithm> 9 #include <algorithm>
10 #include <utility> 10 #include <utility>
(...skipping 24 matching lines...) Expand all
35 #include "media/media_features.h" 35 #include "media/media_features.h"
36 #include "testing/gtest/include/gtest/gtest.h" 36 #include "testing/gtest/include/gtest/gtest.h"
37 37
38 using ::testing::AnyNumber; 38 using ::testing::AnyNumber;
39 using ::testing::Exactly; 39 using ::testing::Exactly;
40 using ::testing::HasSubstr; 40 using ::testing::HasSubstr;
41 using ::testing::InSequence; 41 using ::testing::InSequence;
42 using ::testing::NotNull; 42 using ::testing::NotNull;
43 using ::testing::Return; 43 using ::testing::Return;
44 using ::testing::SaveArg; 44 using ::testing::SaveArg;
45 using ::testing::SetArgumentPointee; 45 using ::testing::SetArgPointee;
46 using ::testing::StrictMock; 46 using ::testing::StrictMock;
47 using ::testing::WithParamInterface; 47 using ::testing::WithParamInterface;
48 using ::testing::_; 48 using ::testing::_;
49 49
50 namespace media { 50 namespace media {
51 51
52 const uint8_t kTracksHeader[] = { 52 const uint8_t kTracksHeader[] = {
53 0x16, 0x54, 0xAE, 0x6B, // Tracks ID 53 0x16, 0x54, 0xAE, 0x6B, // Tracks ID
54 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // tracks(size = 0) 54 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // tracks(size = 0)
55 }; 55 };
(...skipping 4746 matching lines...) Expand 10 before | Expand all | Expand 10 after
4802 4802
4803 EXPECT_EQ(demuxer_->AddId("source_id", "video/mp4", "vp09.00.10.08"), 4803 EXPECT_EQ(demuxer_->AddId("source_id", "video/mp4", "vp09.00.10.08"),
4804 expected); 4804 expected);
4805 } 4805 }
4806 4806
4807 INSTANTIATE_TEST_CASE_P(EnableDisableMp4Vp9Demuxing, 4807 INSTANTIATE_TEST_CASE_P(EnableDisableMp4Vp9Demuxing,
4808 ChunkDemuxerMp4Vp9Test, 4808 ChunkDemuxerMp4Vp9Test,
4809 ::testing::Bool()); 4809 ::testing::Bool());
4810 4810
4811 } // namespace media 4811 } // namespace media
OLDNEW
« no previous file with comments | « media/audio/cras/cras_unified_unittest.cc ('k') | media/filters/ffmpeg_glue_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698