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

Unified Diff: components/copresence/handlers/audio/audio_directive_handler.cc

Issue 665353002: Add AudioDirectiveHandler timed tests. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@audio_redesign
Patch Set: build fix. Created 6 years, 2 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 side-by-side diff with in-line comments
Download patch
Index: components/copresence/handlers/audio/audio_directive_handler.cc
diff --git a/components/copresence/handlers/audio/audio_directive_handler.cc b/components/copresence/handlers/audio/audio_directive_handler.cc
index 9a7973803a094937b275122e343fc336b27314ec..7563193a23a42206bd450af616898c44b84707fb 100644
--- a/components/copresence/handlers/audio/audio_directive_handler.cc
+++ b/components/copresence/handlers/audio/audio_directive_handler.cc
@@ -10,6 +10,7 @@
#include "base/time/default_tick_clock.h"
#include "base/time/time.h"
#include "base/timer/timer.h"
+#include "components/copresence/handlers/audio/tick_clock_ref_counted.h"
#include "components/copresence/mediums/audio/audio_manager_impl.h"
#include "components/copresence/proto/data.pb.h"
#include "components/copresence/public/copresence_constants.h"
@@ -36,7 +37,8 @@ base::TimeTicks GetEarliestEventTime(AudioDirectiveList* list,
AudioDirectiveHandler::AudioDirectiveHandler()
: audio_event_timer_(new base::OneShotTimer<AudioDirectiveHandler>),
- clock_(new base::DefaultTickClock) {
+ clock_(new TickClockRefCounted(
+ make_scoped_ptr(new base::DefaultTickClock))) {
}
AudioDirectiveHandler::~AudioDirectiveHandler() {
@@ -107,6 +109,22 @@ void AudioDirectiveHandler::RemoveInstructions(const std::string& op_id) {
const std::string AudioDirectiveHandler::PlayingToken(AudioType type) const {
return audio_manager_->GetToken(type);
}
+
+void AudioDirectiveHandler::set_clock_for_testing(
+ const scoped_refptr<TickClockRefCounted>& clock) {
+ clock_ = clock;
+
+ transmits_list_[AUDIBLE].set_clock_for_testing(clock);
+ transmits_list_[INAUDIBLE].set_clock_for_testing(clock);
+ receives_list_[AUDIBLE].set_clock_for_testing(clock);
+ receives_list_[INAUDIBLE].set_clock_for_testing(clock);
+}
+
+void AudioDirectiveHandler::set_timer_for_testing(
+ scoped_ptr<base::Timer> timer) {
+ audio_event_timer_.swap(timer);
+}
+
// Private methods.
void AudioDirectiveHandler::ProcessNextInstruction() {

Powered by Google App Engine
This is Rietveld 408576698