Audio Directive Handler cleanup

components/copresence/handlers/audio/audio_directive_handler.h

 // 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.
 
 #ifndef COMPONENTS_COPRESENCE_HANDLERS_AUDIO_AUDIO_DIRECTIVE_HANDLER_H_
 #define COMPONENTS_COPRESENCE_HANDLERS_AUDIO_AUDIO_DIRECTIVE_HANDLER_H_
 
 #include <string>
 
 #include "base/basictypes.h"
@@ skipping 73 matching lines @@
   FRIEND_TEST_ALL_PREFIXES(AudioDirectiveHandlerTest, Basic);
 
   typedef TimedMap<std::string, scoped_refptr<media::AudioBusRefCounted> >
       SamplesMap;
 
   // Processes the next active transmit instruction.
   void ProcessNextTransmit();
   // Processes the next active receive instruction.
   void ProcessNextReceive();
 
-  void HandleToken(const std::string token, bool audible);
+  void PlayToken(const std::string token, bool audible);
 
   // This is the method that the whispernet client needs to call to return
   // samples to us.
-  void OnTokenEncoded(const std::string& token,
-                      bool audible,
-                      const scoped_refptr<media::AudioBusRefCounted>& samples);
+  void PlayEncodedToken(
+      const std::string& token,
+      bool audible,
+      const scoped_refptr<media::AudioBusRefCounted>& samples);
 
   AudioDirectiveList transmits_list_audible_;
   AudioDirectiveList transmits_list_inaudible_;
   AudioDirectiveList receives_list_;
 
   // Currently playing tokens.
   std::string current_token_audible_;
   std::string current_token_inaudible_;
 
   // AudioPlayer and AudioRecorder objects are self-deleting. When we call
@@ skipping 13 matching lines @@
   // expires the oldest samples first.
   SamplesMap samples_cache_audible_;
   SamplesMap samples_cache_inaudible_;
 
   DISALLOW_COPY_AND_ASSIGN(AudioDirectiveHandler);
 };
 
 }  // namespace copresence
 
 #endif  // COMPONENTS_COPRESENCE_HANDLERS_AUDIO_AUDIO_DIRECTIVE_HANDLER_H_