Revert of Adding CopresenceState

components/copresence/handlers/audio/audio_directive_handler_impl.cc

Index: components/copresence/handlers/audio/audio_directive_handler_impl.cc
diff --git a/components/copresence/handlers/audio/audio_directive_handler_impl.cc b/components/copresence/handlers/audio/audio_directive_handler_impl.cc
index 57284dc26867b813f1f11117332ee4b8d75716a1..c5c57f933e08e93d4009c35515338b7db3c39c9c 100644
--- a/components/copresence/handlers/audio/audio_directive_handler_impl.cc
+++ b/components/copresence/handlers/audio/audio_directive_handler_impl.cc
@@ -5,7 +5,6 @@
 #include "components/copresence/handlers/audio/audio_directive_handler_impl.h"
 
 #include <algorithm>
-#include <vector>
 
 #include "base/bind.h"
 #include "base/logging.h"
@@ -34,31 +33,23 @@
       std::min(list->GetActiveDirective()->end_time, event_time);
 }
 
-void ConvertDirectives(const std::vector<AudioDirective>& in_directives,
-                       std::vector<Directive>* out_directives) {
-  for (const AudioDirective& in_directive : in_directives)
-    out_directives->push_back(in_directive.server_directive);
-}
-
 }  // namespace
 
 
 // Public functions.
 
-AudioDirectiveHandlerImpl::AudioDirectiveHandlerImpl(
-    const DirectivesCallback& update_directives_callback)
-    : update_directives_callback_(update_directives_callback),
-      audio_manager_(new AudioManagerImpl),
+AudioDirectiveHandlerImpl::AudioDirectiveHandlerImpl()
+    : audio_manager_(new AudioManagerImpl),
       audio_event_timer_(new base::OneShotTimer<AudioDirectiveHandler>),
       clock_(new TickClockRefCounted(new base::DefaultTickClock)) {}
 
+// TODO(ckehoe): Merge these two constructors when
+//               delegating constructors are allowed.
 AudioDirectiveHandlerImpl::AudioDirectiveHandlerImpl(
-    const DirectivesCallback& update_directives_callback,
     scoped_ptr<AudioManager> audio_manager,
     scoped_ptr<base::Timer> timer,
     const scoped_refptr<TickClockRefCounted>& clock)
-    : update_directives_callback_(update_directives_callback),
-      audio_manager_(audio_manager.Pass()),
+    : audio_manager_(audio_manager.Pass()),
       audio_event_timer_(timer.Pass()),
       clock_(clock) {}
 
@@ -80,14 +71,11 @@
 }
 
 void AudioDirectiveHandlerImpl::AddInstruction(
-    const Directive& directive,
-    const std::string& op_id) {
+    const TokenInstruction& instruction,
+    const std::string& op_id,
+    base::TimeDelta ttl) {
   DCHECK(transmits_lists_.size() == 2u && receives_lists_.size() == 2u)
       << "Call Initialize() before other AudioDirectiveHandler methods";
-
-  const TokenInstruction& instruction = directive.token_instruction();
-  base::TimeDelta ttl =
-      base::TimeDelta::FromMilliseconds(directive.ttl_millis());
 
   switch (instruction.token_instruction_type()) {
     case TRANSMIT:
@@ -97,11 +85,11 @@
                << " with TTL=" << ttl.InMilliseconds();
       switch (instruction.medium()) {
         case AUDIO_ULTRASOUND_PASSBAND:
-          transmits_lists_[INAUDIBLE]->AddDirective(op_id, directive);
+          transmits_lists_[INAUDIBLE]->AddDirective(op_id, ttl);
           audio_manager_->SetToken(INAUDIBLE, instruction.token_id());
           break;
         case AUDIO_AUDIBLE_DTMF:
-          transmits_lists_[AUDIBLE]->AddDirective(op_id, directive);
+          transmits_lists_[AUDIBLE]->AddDirective(op_id, ttl);
           audio_manager_->SetToken(AUDIBLE, instruction.token_id());
           break;
         default:
@@ -114,10 +102,10 @@
                << " with TTL=" << ttl.InMilliseconds();
       switch (instruction.medium()) {
         case AUDIO_ULTRASOUND_PASSBAND:
-          receives_lists_[INAUDIBLE]->AddDirective(op_id, directive);
+          receives_lists_[INAUDIBLE]->AddDirective(op_id, ttl);
           break;
         case AUDIO_AUDIBLE_DTMF:
-          receives_lists_[AUDIBLE]->AddDirective(op_id, directive);
+          receives_lists_[AUDIBLE]->AddDirective(op_id, ttl);
           break;
         default:
           NOTREACHED();
@@ -151,7 +139,6 @@
 bool AudioDirectiveHandlerImpl::IsPlayingTokenHeard(AudioType type) const {
   return audio_manager_->IsPlayingTokenHeard(type);
 }
-
 
 // Private functions.
 
@@ -191,15 +178,6 @@
         base::Bind(&AudioDirectiveHandlerImpl::ProcessNextInstruction,
                    base::Unretained(this)));
   }
-
-  // TODO(crbug.com/436584): Instead of this, store the directives
-  // in a single list, and prune them when expired.
-  std::vector<Directive> directives;
-  ConvertDirectives(transmits_lists_[AUDIBLE]->directives(), &directives);
-  ConvertDirectives(transmits_lists_[INAUDIBLE]->directives(), &directives);
-  ConvertDirectives(receives_lists_[AUDIBLE]->directives(), &directives);
-  ConvertDirectives(receives_lists_[INAUDIBLE]->directives(), &directives);
-  update_directives_callback_.Run(directives);
 }
 
 bool AudioDirectiveHandlerImpl::GetNextInstructionExpiry(