Redesign the copresence audio handlers.

components/copresence/rpc/rpc_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/rpc/rpc_handler.h"
 
 #include <map>
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/guid.h"
 #include "base/logging.h"
 #include "base/strings/string_util.h"
 
 // TODO(ckehoe): time.h includes windows.h, which #defines DeviceCapabilities
 // to DeviceCapabilitiesW. This breaks the pb.h headers below. For now,
 // we fix this with an #undef.
 #include "base/time/time.h"
 #if defined(OS_WIN)
 #undef DeviceCapabilities
 #endif
 
 #include "components/copresence/copresence_switches.h"
 #include "components/copresence/handlers/directive_handler.h"
 #include "components/copresence/proto/codes.pb.h"
 #include "components/copresence/proto/data.pb.h"
 #include "components/copresence/proto/rpcs.pb.h"
+#include "components/copresence/public/copresence_constants.h"
 #include "components/copresence/public/copresence_delegate.h"
 #include "net/http/http_status_code.h"
 
 // TODO(ckehoe): Return error messages for bad requests.
 
 namespace copresence {
 
 using google::protobuf::MessageLite;
 using google::protobuf::RepeatedPtrField;
 
@@ skipping 121 matching lines @@
                                        base::Unretained(this))) {}
 
 RpcHandler::~RpcHandler() {
   for (HttpPost* post : pending_posts_) {
     delete post;
   }
 
   if (delegate_ && delegate_->GetWhispernetClient()) {
     delegate_->GetWhispernetClient()->RegisterTokensCallback(
         WhispernetClient::TokensCallback());
+    delegate_->GetWhispernetClient()->RegisterSamplesCallback(
+        WhispernetClient::SamplesCallback());
   }
 }
 
 void RpcHandler::Initialize(const SuccessCallback& init_done_callback) {
   scoped_ptr<RegisterDeviceRequest> request(new RegisterDeviceRequest);
   DCHECK(device_id_.empty());
 
   request->mutable_push_service()->set_service(PUSH_SERVICE_NONE);
   Identity* identity =
       request->mutable_device_identifiers()->mutable_registrant();
@@ skipping 196 matching lines @@
         request.manage_subscriptions_request().id_to_unsubscribe()) {
       directive_handler_->RemoveDirectives(unsubscribe);
     }
   }
 }
 
 void RpcHandler::AddPlayingTokens(ReportRequest* request) {
   if (!directive_handler_)
     return;
 
-  const std::string& audible_token = directive_handler_->CurrentAudibleToken();
+  const std::string& audible_token =
+      directive_handler_->GetCurrentAudioToken(AUDIBLE);
   const std::string& inaudible_token =
-      directive_handler_->CurrentInaudibleToken();
+      directive_handler_->GetCurrentAudioToken(INAUDIBLE);
 
   if (!audible_token.empty())
     AddTokenToRequest(request, AudioToken(audible_token, true));
   if (!inaudible_token.empty())
     AddTokenToRequest(request, AudioToken(inaudible_token, false));
 }
 
 void RpcHandler::DispatchMessages(
     const RepeatedPtrField<SubscribedMessage>& messages) {
   if (messages.size() == 0)
@@ skipping 72 matching lines @@
       command_line->GetSwitchValueASCII(switches::kCopresenceTracingToken),
       delegate_->GetAPIKey(),
       *request_proto);
 
   http_post->Start(base::Bind(callback, http_post));
   pending_posts_.insert(http_post);
 }
 
 void RpcHandler::AudioDirectiveListToWhispernetConnector(
     const std::string& token,
-    bool audible,
+    AudioType type,
     const WhispernetClient::SamplesCallback& samples_callback) {
+  DCHECK(type == AUDIBLE || type == INAUDIBLE);
   WhispernetClient* whispernet_client = delegate_->GetWhispernetClient();
   if (whispernet_client) {
     whispernet_client->RegisterSamplesCallback(samples_callback);
-    whispernet_client->EncodeToken(token, audible);
+    whispernet_client->EncodeToken(token, type);
   }
 }
 
 }  // namespace copresence