Redesign the copresence audio handlers.

chrome/browser/copresence/chrome_whispernet_client.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 "chrome/browser/copresence/chrome_whispernet_client.h"
 
 #include "chrome/browser/extensions/api/copresence_private/copresence_private_api.h"
 #include "chrome/browser/extensions/component_loader.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/common/extensions/api/copresence_private.h"
@@ skipping 45 matching lines @@
 void ChromeWhispernetClient::Shutdown() {
   extension_loaded_callback_.Reset();
   init_callback_.Reset();
   tokens_callback_.Reset();
   samples_callback_.Reset();
   db_callback_.Reset();
 }
 
 // Fire an event to request a token encode.
 void ChromeWhispernetClient::EncodeToken(const std::string& token,
-                                         bool audible) {
+                                         copresence::AudioType type) {
   DCHECK(extension_loaded_);
   DCHECK(browser_context_);
   DCHECK(extensions::EventRouter::Get(browser_context_));
 
   scoped_ptr<extensions::Event> event(new extensions::Event(
       extensions::api::copresence_private::OnEncodeTokenRequest::kEventName,
       extensions::api::copresence_private::OnEncodeTokenRequest::Create(
-          token, audible),
+          token, type == copresence::AUDIBLE),
       browser_context_));
 
   extensions::EventRouter::Get(browser_context_)
       ->DispatchEventToExtension(kWhispernetProxyExtensionId, event.Pass());
 }
 
 // Fire an event to request a decode for the given samples.
-void ChromeWhispernetClient::DecodeSamples(const std::string& samples) {
+void ChromeWhispernetClient::DecodeSamples(copresence::AudioType type,
+                                           const std::string& samples) {
   DCHECK(extension_loaded_);
   DCHECK(browser_context_);
   DCHECK(extensions::EventRouter::Get(browser_context_));
 
+  extensions::api::copresence_private::DecodeRequestType request_type;
+
+  switch (type) {

[Daniel Erat, 2014/10/17 22:25:59]

you could get compile-time checking that all enum values are covered if you
moved this into a helper function in an anon namespace:

  extensions::api::copresence_private::DecodeRequestType
  GetDecodeRequestTypeForAudioType(copresence::AudioType audio_type) {
    switch (audio_type) {
      case copresence::AUDIBLE:
        return extensions::api::copresence_private::DECODE_REQUEST_TYPE_AUDIBLE;
      case ...
    }
    NOTREACHED() << "Invalid audio type " << audio_type;
  }

[rkc, 2014/10/18 00:21:54]

Code removed with Patch 3.

+    case copresence::AUDIBLE:
+      request_type =
+          extensions::api::copresence_private::DECODE_REQUEST_TYPE_AUDIBLE;
+      break;
+    case copresence::INAUDIBLE:
+      request_type =
+          extensions::api::copresence_private::DECODE_REQUEST_TYPE_INAUDIBLE;
+      break;
+    case copresence::BOTH:
+      request_type =
+          extensions::api::copresence_private::DECODE_REQUEST_TYPE_BOTH;
+      break;
+    default:
+      request_type =
+          extensions::api::copresence_private::DECODE_REQUEST_TYPE_NONE;
+      LOG(ERROR) << "Unknown decode request type received: " << type;
+  }
+
   scoped_ptr<extensions::Event> event(new extensions::Event(
       extensions::api::copresence_private::OnDecodeSamplesRequest::kEventName,
       extensions::api::copresence_private::OnDecodeSamplesRequest::Create(
-          samples),
+          request_type, samples),
       browser_context_));
 
   extensions::EventRouter::Get(browser_context_)
       ->DispatchEventToExtension(kWhispernetProxyExtensionId, event.Pass());
 }
 
 void ChromeWhispernetClient::DetectBroadcast() {
   DCHECK(extension_loaded_);
   DCHECK(browser_context_);
   DCHECK(extensions::EventRouter::Get(browser_context_));
@@ skipping 81 matching lines @@
   params.play.carrier_frequency = copresence::kDefaultCarrierFrequency;
   params.play.repetitions = copresence::kDefaultRepetitions;
 
   params.record.sample_rate = copresence::kDefaultSampleRate;
   params.record.bits_per_sample = copresence::kDefaultBitsPerSample;
   params.record.carrier_frequency = copresence::kDefaultCarrierFrequency;
   params.record.channels = copresence::kDefaultChannels;
 
   InitializeWhispernet(params);
 }