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

Side by Side Diff: media/audio/cras/cras_unified_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/alsa/alsa_output_unittest.cc ('k') | media/filters/chunk_demuxer_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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 <stdint.h> 5 #include <stdint.h>
6 6
7 #include <memory> 7 #include <memory>
8 #include <string> 8 #include <string>
9 9
10 #include "base/macros.h" 10 #include "base/macros.h"
(...skipping 13 matching lines...) Expand all
24 // cras_util.h defines custom min/max macros which break compilation, so ensure 24 // cras_util.h defines custom min/max macros which break compilation, so ensure
25 // it's not included until last. #if avoids presubmit errors. 25 // it's not included until last. #if avoids presubmit errors.
26 #if defined(USE_CRAS) 26 #if defined(USE_CRAS)
27 #include "media/audio/cras/cras_unified.h" 27 #include "media/audio/cras/cras_unified.h"
28 #endif 28 #endif
29 29
30 using testing::_; 30 using testing::_;
31 using testing::DoAll; 31 using testing::DoAll;
32 using testing::InvokeWithoutArgs; 32 using testing::InvokeWithoutArgs;
33 using testing::Return; 33 using testing::Return;
34 using testing::SetArgumentPointee; 34 using testing::SetArgPointee;
35 using testing::StrictMock; 35 using testing::StrictMock;
36 36
37 namespace media { 37 namespace media {
38 38
39 class MockAudioManagerCras : public AudioManagerCras { 39 class MockAudioManagerCras : public AudioManagerCras {
40 public: 40 public:
41 MockAudioManagerCras() 41 MockAudioManagerCras()
42 : AudioManagerCras(base::ThreadTaskRunnerHandle::Get(), 42 : AudioManagerCras(base::ThreadTaskRunnerHandle::Get(),
43 base::ThreadTaskRunnerHandle::Get(), 43 base::ThreadTaskRunnerHandle::Get(),
44 &fake_audio_log_factory_) {} 44 &fake_audio_log_factory_) {}
(...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after
155 155
156 // Wait for samples to be captured. 156 // Wait for samples to be captured.
157 EXPECT_TRUE(event.TimedWait(TestTimeouts::action_timeout())); 157 EXPECT_TRUE(event.TimedWait(TestTimeouts::action_timeout()));
158 158
159 test_stream->Stop(); 159 test_stream->Stop();
160 160
161 test_stream->Close(); 161 test_stream->Close();
162 } 162 }
163 163
164 } // namespace media 164 } // namespace media
OLDNEW
« no previous file with comments | « media/audio/alsa/alsa_output_unittest.cc ('k') | media/filters/chunk_demuxer_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698