Revert of Revert of Adding CopresenceState

components/copresence/handlers/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/directive_handler_impl.h"
 
 #include "base/bind.h"
 #include "base/guid.h"
 #include "base/logging.h"
 #include "base/time/time.h"
 #include "components/copresence/handlers/audio/audio_directive_handler_impl.h"
 #include "components/copresence/proto/data.pb.h"
 
 namespace {
 
 const int kMaxUnlabeledDirectiveTtl = 60000;  // 1 minute
 
 }  // namespace
 
 namespace copresence {
 
-// Public functions
+// Public functions.
 
 DirectiveHandlerImpl::DirectiveHandlerImpl(
+    const DirectivesCallback& update_directives_callback)
+    : DirectiveHandlerImpl(update_directives_callback,
+                           make_scoped_ptr(new AudioDirectiveHandlerImpl(
+                               update_directives_callback))) {}
+
+DirectiveHandlerImpl::DirectiveHandlerImpl(
+    const DirectivesCallback& update_directives_callback,
     scoped_ptr<AudioDirectiveHandler> audio_handler)
-    : audio_handler_(audio_handler.Pass()), is_started_(false) {}
+    : audio_handler_(audio_handler.Pass()),
+      is_started_(false) {}
 
 DirectiveHandlerImpl::~DirectiveHandlerImpl() {}
 
 void DirectiveHandlerImpl::Start(WhispernetClient* whispernet_client,
                                  const TokensCallback& tokens_cb) {
   audio_handler_->Initialize(whispernet_client, tokens_cb);
   DVLOG(2) << "Directive handler starting";
 
   is_started_ = true;
 
@@ skipping 51 matching lines @@
 const std::string DirectiveHandlerImpl::GetCurrentAudioToken(AudioType type)
     const {
   // If whispernet_client_ is null, audio_handler_ hasn't been Initialized.
   return is_started_ ? audio_handler_->PlayingToken(type) : "";
 }
 
 bool DirectiveHandlerImpl::IsAudioTokenHeard(AudioType type) const {
   return is_started_ ? audio_handler_->IsPlayingTokenHeard(type) : false;
 }
 
-// Private functions
+
+// Private functions.
 
 void DirectiveHandlerImpl::StartDirective(const std::string& op_id,
                                           const Directive& directive) {
   DCHECK(is_started_);
-  const TokenInstruction& ti = directive.token_instruction();
-  if (ti.medium() == AUDIO_ULTRASOUND_PASSBAND ||
-      ti.medium() == AUDIO_AUDIBLE_DTMF) {
-    audio_handler_->AddInstruction(
-        ti, op_id, base::TimeDelta::FromMilliseconds(directive.ttl_millis()));
-  } else {
-    // We should only get audio directives.
-    NOTREACHED() << "Received directive for unimplemented medium "
-                 << ti.medium();
-  }
+  DLOG_IF(WARNING, directive.delay_millis() > 0)
+      << "Ignoring " << directive.delay_millis() << " delay for directive";
+  const TokenMedium& medium = directive.token_instruction().medium();
+  DCHECK(medium == AUDIO_ULTRASOUND_PASSBAND || medium == AUDIO_AUDIBLE_DTMF)
+      << "Received directive for unimplemented medium " << medium;
+  audio_handler_->AddInstruction(directive, op_id);
 }
 
 }  // namespace copresence