Refactoring AudioDirectiveHandler to support testing

components/copresence/handlers/audio/audio_directive_list.h

Index: components/copresence/handlers/audio/audio_directive_list.h
diff --git a/components/copresence/handlers/audio/audio_directive_list.h b/components/copresence/handlers/audio/audio_directive_list.h
index aa71a994e30f697dbcc661c6d5340cbb556bbf70..3165088437ec3f5b47a00a950b0b91b166d5676a 100644
--- a/components/copresence/handlers/audio/audio_directive_list.h
+++ b/components/copresence/handlers/audio/audio_directive_list.h
@@ -8,11 +8,13 @@
 #include <string>
 #include <vector>
 
-#include "base/callback.h"
+#include "base/callback_forward.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
+#include "base/time/default_tick_clock.h"
 #include "base/time/time.h"
+#include "components/copresence/handlers/audio/tick_clock_ref_counted.h"
 
 namespace media {
 class AudioBusRefCounted;
@@ -41,7 +43,8 @@ struct AudioDirective final {
 // classes from it.
 class AudioDirectiveList {
  public:
-  AudioDirectiveList();
+  explicit AudioDirectiveList(const scoped_refptr<TickClockRefCounted>& clock =

[Charlie, 2014/10/31 20:55:17]

I think we're always passing in a clock now. So we can make this argument
required if you want.

[rkc, 2014/11/03 20:14:43]

Sure.

[Charlie, 2014/11/03 22:45:13]

I take it back. The unit test gets ugly without this. And using the default
clock is a good, well, default behavior.

+      make_scoped_refptr(new TickClockRefCounted(new base::DefaultTickClock)));
   ~AudioDirectiveList();
 
   void AddDirective(const std::string& op_id, base::TimeDelta ttl);
@@ -49,8 +52,6 @@ class AudioDirectiveList {
 
   scoped_ptr<AudioDirective> GetActiveDirective();
 
-  void set_clock_for_testing(const scoped_refptr<TickClockRefCounted>& clock);
-
  private:
   // Comparator for comparing end_times on audio tokens.
   class LatestFirstComparator {