Redesign the copresence audio handlers.

components/copresence/handlers/directive_handler.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "components/copresence/handlers/directive_handler.h"
 
 #include "base/time/time.h"
 #include "components/copresence/handlers/audio/audio_directive_handler.h"
 #include "components/copresence/proto/data.pb.h"
 
 namespace copresence {
 
 DirectiveHandler::DirectiveHandler() {}
 
 void DirectiveHandler::Initialize(
-    const AudioRecorder::DecodeSamplesCallback& decode_cb,
-    const AudioDirectiveHandler::EncodeTokenCallback& encode_cb) {
-  audio_handler_.reset(new AudioDirectiveHandler(decode_cb, encode_cb));
-  audio_handler_->Initialize();
+    const AudioManager::DecodeSamplesCallback& decode_cb,
+    const AudioManager::EncodeTokenCallback& encode_cb) {
+  audio_handler_.reset(new AudioDirectiveHandler());
+  audio_handler_->Initialize(decode_cb, encode_cb);
 }
 
 DirectiveHandler::~DirectiveHandler() {
 }
 
 void DirectiveHandler::AddDirective(const Directive& directive) {
   // We only handle Token directives; wifi/ble requests aren't implemented.
   DCHECK_EQ(directive.instruction_type(), TOKEN);
 
   std::string op_id;
@@ skipping 16 matching lines @@
         ti, op_id, base::TimeDelta::FromMilliseconds(directive.ttl_millis()));
   }
 }
 
 void DirectiveHandler::RemoveDirectives(const std::string& op_id) {
   DCHECK(audio_handler_.get()) << "Clients must call Initialize() before "
                                << "any other DirectiveHandler methods.";
   audio_handler_->RemoveInstructions(op_id);
 }
 
-const std::string& DirectiveHandler::CurrentAudibleToken() const {
-  return audio_handler_->PlayingAudibleToken();
-}
-
-const std::string& DirectiveHandler::CurrentInaudibleToken() const {
-  return audio_handler_->PlayingInaudibleToken();
+const std::string& DirectiveHandler::GetCurrentAudioToken(
+    AudioType type) const {
+  return audio_handler_->PlayingToken(type);
 }
 
 }  // namespace copresence