Redesign the copresence audio handlers.

components/copresence/handlers/directive_handler.h

Index: components/copresence/handlers/directive_handler.h
diff --git a/components/copresence/handlers/directive_handler.h b/components/copresence/handlers/directive_handler.h
index f36aa88cc19a3a9e57d91dec81625c5001576ad1..490b3b33d56714b79d8640e00c51512d378046b2 100644
--- a/components/copresence/handlers/directive_handler.h
+++ b/components/copresence/handlers/directive_handler.h
@@ -11,7 +11,7 @@
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "components/copresence/handlers/audio/audio_directive_handler.h"
-#include "components/copresence/mediums/audio/audio_recorder.h"
+#include "components/copresence/mediums/audio/audio_manager.h"
 
 namespace copresence {
 
@@ -28,17 +28,15 @@ class DirectiveHandler {
   // This function must be called before any others.
   // TODO(ckehoe): Instead of this, use a static Create() method
   //               and make the constructor private.
-  virtual void Initialize(
-      const AudioRecorder::DecodeSamplesCallback& decode_cb,
-      const AudioDirectiveHandler::EncodeTokenCallback& encode_cb);
+  virtual void Initialize(const AudioManager::DecodeSamplesCallback& decode_cb,
+                          const AudioManager::EncodeTokenCallback& encode_cb);
 
   // Adds a directive to handle.
   virtual void AddDirective(const copresence::Directive& directive);
   // Removes any directives associated with the given operation id.
   virtual void RemoveDirectives(const std::string& op_id);
 
-  const std::string& CurrentAudibleToken() const;
-  const std::string& CurrentInaudibleToken() const;
+  const std::string& CurrentAudioToken(AudioType type) const;

[Daniel Erat, 2014/10/17 22:26:00]

nit: rename to GetCurrentAudioToken?

[rkc, 2014/10/18 00:21:55]

Done.

 
  private:
   scoped_ptr<AudioDirectiveHandler> audio_handler_;