64-bit token fixes

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 35 matching lines @@
 AudioManagerImpl::AudioManagerImpl()
     : whispernet_client_(nullptr), recorder_(nullptr) {
   // TODO(rkc): Move all of these into initializer lists once it is allowed.
   should_be_playing_[AUDIBLE] = false;
   should_be_playing_[INAUDIBLE] = false;
   should_be_recording_[AUDIBLE] = false;
   should_be_recording_[INAUDIBLE] = false;
 
   player_[AUDIBLE] = nullptr;
   player_[INAUDIBLE] = nullptr;
+  token_length_[0] = 0;
+  token_length_[1] = 0;
 }
 
 void AudioManagerImpl::Initialize(WhispernetClient* whispernet_client,
                                   const TokensCallback& tokens_cb) {
   samples_cache_.resize(2);
   samples_cache_[AUDIBLE] = new SamplesMap(
       base::TimeDelta::FromMilliseconds(kSampleExpiryTimeMs), kMaxSamples);
   samples_cache_[INAUDIBLE] = new SamplesMap(
       base::TimeDelta::FromMilliseconds(kSampleExpiryTimeMs), kMaxSamples);
 
@@ skipping 67 matching lines @@
   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_unsafe_token) {
+                                const std::string& url_safe_token) {
   DCHECK(type == AUDIBLE || type == INAUDIBLE);
-  std::string token = FromUrlSafe(url_unsafe_token);
+  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] : "";
 }
@@ skipping 85 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