Revert of Adding CopresenceState

components/copresence/handlers/audio/audio_directive_handler_impl.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/audio/audio_directive_handler_impl.h"
 
 #include <algorithm>
-#include <vector>
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/time/default_tick_clock.h"
 #include "base/time/time.h"
 #include "base/timer/timer.h"
 #include "components/copresence/handlers/audio/audio_directive_list.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"
 #include "media/base/audio_bus.h"
 
 namespace copresence {
 
 namespace {
 
 base::TimeTicks GetEarliestEventTime(AudioDirectiveList* list,
                                      base::TimeTicks event_time) {
   if (!list->GetActiveDirective())
     return event_time;
 
   return event_time.is_null() ?
       list->GetActiveDirective()->end_time :
       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) {}
 
 AudioDirectiveHandlerImpl::~AudioDirectiveHandlerImpl() {}
 
 void AudioDirectiveHandlerImpl::Initialize(WhispernetClient* whispernet_client,
                                            const TokensCallback& tokens_cb) {
   if (!audio_manager_)
     audio_manager_.reset(new AudioManagerImpl());
   audio_manager_->Initialize(whispernet_client, tokens_cb);
 
   DCHECK(transmits_lists_.empty());
   transmits_lists_.push_back(new AudioDirectiveList(clock_));
   transmits_lists_.push_back(new AudioDirectiveList(clock_));
 
   DCHECK(receives_lists_.empty());
   receives_lists_.push_back(new AudioDirectiveList(clock_));
   receives_lists_.push_back(new AudioDirectiveList(clock_));
 }
 
 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:
       DVLOG(2) << "Audio Transmit Directive received. Token: "
                << instruction.token_id()
                << " with medium=" << instruction.medium()
                << " 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:
           NOTREACHED();
       }
       break;
     case RECEIVE:
       DVLOG(2) << "Audio Receive Directive received."
                << " with medium=" << instruction.medium()
                << " 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();
       }
       break;
     case UNKNOWN_TOKEN_INSTRUCTION_TYPE:
     default:
       LOG(WARNING) << "Unknown Audio Transmit Directive received. type = "
                    << instruction.token_instruction_type();
   }
@@ skipping 14 matching lines @@
 
 const std::string AudioDirectiveHandlerImpl::PlayingToken(
     AudioType type) const {
   return audio_manager_->GetToken(type);
 }
 
 bool AudioDirectiveHandlerImpl::IsPlayingTokenHeard(AudioType type) const {
   return audio_manager_->IsPlayingTokenHeard(type);
 }
 
-
 // Private functions.
 
 void AudioDirectiveHandlerImpl::ProcessNextInstruction() {
   DCHECK(audio_event_timer_);
   audio_event_timer_->Stop();
 
   // Change |audio_manager_| state for audible transmits.
   if (transmits_lists_[AUDIBLE]->GetActiveDirective())
     audio_manager_->StartPlaying(AUDIBLE);
   else
@@ skipping 18 matching lines @@
     audio_manager_->StopRecording(INAUDIBLE);
 
   base::TimeTicks next_event_time;
   if (GetNextInstructionExpiry(&next_event_time)) {
     audio_event_timer_->Start(
         FROM_HERE,
         next_event_time - clock_->NowTicks(),
         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(
     base::TimeTicks* expiry) {
   DCHECK(expiry);
 
   *expiry = GetEarliestEventTime(transmits_lists_[AUDIBLE], base::TimeTicks());
   *expiry = GetEarliestEventTime(transmits_lists_[INAUDIBLE], *expiry);
   *expiry = GetEarliestEventTime(receives_lists_[AUDIBLE], *expiry);
   *expiry = GetEarliestEventTime(receives_lists_[INAUDIBLE], *expiry);
 
   return !expiry->is_null();
 }
 
 }  // namespace copresence