Redesign the copresence audio handlers.

components/copresence/public/whispernet_client.h

Index: components/copresence/public/whispernet_client.h
diff --git a/components/copresence/public/whispernet_client.h b/components/copresence/public/whispernet_client.h
index a4e530c28fa676c42f888110e217fd216b3bf44f..2daee236e8b799f2412922899196530650de9dc0 100644
--- a/components/copresence/public/whispernet_client.h
+++ b/components/copresence/public/whispernet_client.h
@@ -11,6 +11,7 @@
 #include "base/callback.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
+#include "components/copresence/public/copresence_constants.h"
 
 namespace media {
 class AudioBusRefCounted;
@@ -37,7 +38,7 @@ class WhispernetClient {
   typedef base::Callback<void(const std::vector<AudioToken>&)> TokensCallback;
   // Callback that returns encoded samples for a given token.
   typedef base::Callback<void(const std::string&,
-                              bool,
+                              AudioType,
                               const scoped_refptr<media::AudioBusRefCounted>&)>
       SamplesCallback;
 
@@ -48,9 +49,9 @@ class WhispernetClient {
   virtual void Shutdown() = 0;
 
   // Fires an event to request a token encode.
-  virtual void EncodeToken(const std::string& token, bool audible) = 0;
+  virtual void EncodeToken(const std::string& token, AudioType type) = 0;
   // Fires an event to request a decode for the given samples.
-  virtual void DecodeSamples(const std::string& samples) = 0;
+  virtual void DecodeSamples(AudioType type, const std::string& samples) = 0;
   // Fires an event to request detection of a whispernet broadcast.
   virtual void DetectBroadcast() = 0;
 
@@ -69,8 +70,6 @@ class WhispernetClient {
   virtual SamplesCallback GetSamplesCallback() = 0;
   virtual SuccessCallback GetDetectBroadcastCallback() = 0;
   virtual SuccessCallback GetInitializedCallback() = 0;
-
-  virtual ~WhispernetClient() {}
 };
 
 }  // namespace copresence