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 "components/copresence/handlers/audio/audio_directive_list.h" | 5 #include "components/copresence/handlers/audio/audio_directive_list.h" |
6 | 6 |
7 #include "base/bind.h" | 7 #include "base/bind.h" |
8 #include "base/logging.h" | 8 #include "base/logging.h" |
9 #include "base/memory/scoped_ptr.h" | 9 #include "base/memory/scoped_ptr.h" |
10 #include "base/time/default_tick_clock.h" | 10 #include "base/time/default_tick_clock.h" |
11 #include "base/time/tick_clock.h" | |
12 #include "base/time/time.h" | 11 #include "base/time/time.h" |
| 12 #include "components/copresence/handlers/audio/tick_clock_ref_counted.h" |
13 | 13 |
14 namespace copresence { | 14 namespace copresence { |
15 | 15 |
16 // Public methods. | 16 // Public methods. |
17 | 17 |
18 AudioDirective::AudioDirective() { | 18 AudioDirective::AudioDirective() { |
19 } | 19 } |
20 | 20 |
21 AudioDirective::AudioDirective(const std::string& op_id, | 21 AudioDirective::AudioDirective(const std::string& op_id, |
22 base::TimeTicks end_time) | 22 base::TimeTicks end_time) |
23 : op_id(op_id), end_time(end_time) { | 23 : op_id(op_id), end_time(end_time) { |
24 } | 24 } |
25 | 25 |
26 AudioDirectiveList::AudioDirectiveList() : clock_(new base::DefaultTickClock) { | 26 AudioDirectiveList::AudioDirectiveList() |
| 27 : clock_(new TickClockRefCounted(new base::DefaultTickClock)) { |
27 } | 28 } |
28 | 29 |
29 AudioDirectiveList::~AudioDirectiveList() { | 30 AudioDirectiveList::~AudioDirectiveList() { |
30 } | 31 } |
31 | 32 |
32 void AudioDirectiveList::AddDirective(const std::string& op_id, | 33 void AudioDirectiveList::AddDirective(const std::string& op_id, |
33 base::TimeDelta ttl) { | 34 base::TimeDelta ttl) { |
34 base::TimeTicks end_time = clock_->NowTicks() + ttl; | 35 base::TimeTicks end_time = clock_->NowTicks() + ttl; |
35 | 36 |
36 // In case this op is already in the list, update it instead of adding | 37 // In case this op is already in the list, update it instead of adding |
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
68 active_directives_.front().end_time < clock_->NowTicks()) { | 69 active_directives_.front().end_time < clock_->NowTicks()) { |
69 active_directives_.clear(); | 70 active_directives_.clear(); |
70 } | 71 } |
71 | 72 |
72 if (active_directives_.empty()) | 73 if (active_directives_.empty()) |
73 return make_scoped_ptr<AudioDirective>(NULL); | 74 return make_scoped_ptr<AudioDirective>(NULL); |
74 | 75 |
75 return make_scoped_ptr(new AudioDirective(active_directives_.front())); | 76 return make_scoped_ptr(new AudioDirective(active_directives_.front())); |
76 } | 77 } |
77 | 78 |
| 79 void AudioDirectiveList::set_clock_for_testing( |
| 80 const scoped_refptr<TickClockRefCounted>& clock) { |
| 81 clock_ = clock; |
| 82 } |
| 83 |
| 84 // Private methods. |
| 85 |
78 std::vector<AudioDirective>::iterator AudioDirectiveList::FindDirectiveByOpId( | 86 std::vector<AudioDirective>::iterator AudioDirectiveList::FindDirectiveByOpId( |
79 const std::string& op_id) { | 87 const std::string& op_id) { |
80 for (std::vector<AudioDirective>::iterator it = active_directives_.begin(); | 88 for (std::vector<AudioDirective>::iterator it = active_directives_.begin(); |
81 it != active_directives_.end(); | 89 it != active_directives_.end(); |
82 ++it) { | 90 ++it) { |
83 if (it->op_id == op_id) | 91 if (it->op_id == op_id) |
84 return it; | 92 return it; |
85 } | 93 } |
86 return active_directives_.end(); | 94 return active_directives_.end(); |
87 } | 95 } |
88 | 96 |
89 } // namespace copresence | 97 } // namespace copresence |
OLD | NEW |