OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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/cast/test/utility/standalone_cast_environment.h" | 5 #include "media/cast/test/utility/standalone_cast_environment.h" |
6 | 6 |
| 7 #include "base/memory/ptr_util.h" |
7 #include "base/time/default_tick_clock.h" | 8 #include "base/time/default_tick_clock.h" |
8 | 9 |
9 namespace media { | 10 namespace media { |
10 namespace cast { | 11 namespace cast { |
11 | 12 |
12 StandaloneCastEnvironment::StandaloneCastEnvironment() | 13 StandaloneCastEnvironment::StandaloneCastEnvironment() |
13 : CastEnvironment( | 14 : CastEnvironment( |
14 make_scoped_ptr<base::TickClock>(new base::DefaultTickClock()), | 15 base::WrapUnique<base::TickClock>(new base::DefaultTickClock()), |
15 NULL, | 16 NULL, |
16 NULL, | 17 NULL, |
17 NULL), | 18 NULL), |
18 main_thread_("StandaloneCastEnvironment Main"), | 19 main_thread_("StandaloneCastEnvironment Main"), |
19 audio_thread_("StandaloneCastEnvironment Audio"), | 20 audio_thread_("StandaloneCastEnvironment Audio"), |
20 video_thread_("StandaloneCastEnvironment Video") { | 21 video_thread_("StandaloneCastEnvironment Video") { |
21 #define CREATE_TASK_RUNNER(name, options) \ | 22 #define CREATE_TASK_RUNNER(name, options) \ |
22 name##_thread_.StartWithOptions(options); \ | 23 name##_thread_.StartWithOptions(options); \ |
23 CastEnvironment::name##_thread_proxy_ = name##_thread_.task_runner() | 24 CastEnvironment::name##_thread_proxy_ = name##_thread_.task_runner() |
24 | 25 |
(...skipping 13 matching lines...) Expand all Loading... |
38 | 39 |
39 void StandaloneCastEnvironment::Shutdown() { | 40 void StandaloneCastEnvironment::Shutdown() { |
40 CHECK(CalledOnValidThread()); | 41 CHECK(CalledOnValidThread()); |
41 main_thread_.Stop(); | 42 main_thread_.Stop(); |
42 audio_thread_.Stop(); | 43 audio_thread_.Stop(); |
43 video_thread_.Stop(); | 44 video_thread_.Stop(); |
44 } | 45 } |
45 | 46 |
46 } // namespace cast | 47 } // namespace cast |
47 } // namespace media | 48 } // namespace media |
OLD | NEW |