Fixing token repetition bug

components/copresence/mediums/audio/audio_manager_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/mediums/audio/audio_manager_impl.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "base/bind.h"
@@ skipping 109 matching lines @@
   }
 }
 
 void AudioManagerImpl::StopPlaying(AudioType type) {
   DCHECK(type == AUDIBLE || type == INAUDIBLE);
   should_be_playing_[type] = false;
   player_[type]->Stop();
   // If we were only recording to hear our own played tokens, stop.
   if (!should_be_recording_[AUDIBLE] && !should_be_recording_[INAUDIBLE])
     recorder_->Stop();
+  playing_token_[type] = std::string();
 }
 
 void AudioManagerImpl::StartRecording(AudioType type) {
   DCHECK(type == AUDIBLE || type == INAUDIBLE);
   should_be_recording_[type] = true;
   recorder_->Record();
 }
 
 void AudioManagerImpl::StopRecording(AudioType type) {
   DCHECK(type == AUDIBLE || type == INAUDIBLE);
   should_be_recording_[type] = false;
   recorder_->Stop();
 }
 
 void AudioManagerImpl::SetToken(AudioType type,
                                 const std::string& url_safe_token) {
   DCHECK(type == AUDIBLE || type == INAUDIBLE);
   std::string token = FromUrlSafe(url_safe_token);
   if (!samples_cache_[type]->HasKey(token)) {
     whispernet_client_->EncodeToken(token, type);
   } else {
     UpdateToken(type, token);
   }
 }
 
 const std::string AudioManagerImpl::GetToken(AudioType type) {
-  return should_be_playing_[type] ? playing_token_[type] : "";
+  return playing_token_[type];
 }
 
 bool AudioManagerImpl::IsPlayingTokenHeard(AudioType type) {
   base::TimeDelta tokenTimeout =
       base::TimeDelta::FromMilliseconds(kTokenTimeoutMs);
 
   // This is a bit of a hack. If we haven't been playing long enough,
   // return true to avoid tripping an audio fail alarm.
   if (base::Time::Now() - started_playing_[type] < tokenTimeout)
     return true;
@@ skipping 76 matching lines @@
   if (decode_audible && decode_inaudible) {
     whispernet_client_->DecodeSamples(BOTH, samples, token_length_);
   } else if (decode_audible) {
     whispernet_client_->DecodeSamples(AUDIBLE, samples, token_length_);
   } else if (decode_inaudible) {
     whispernet_client_->DecodeSamples(INAUDIBLE, samples, token_length_);
   }
 }
 
 }  // namespace copresence