Roll WebRTC 7902:7905, Libjingle 7898:7905

content/renderer/media/webrtc_audio_device_not_impl.cc

 // Copyright 2013 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 "content/renderer/media/webrtc_audio_device_not_impl.h"
 
-namespace {
-
-const int64 kMillisecondsBetweenProcessCalls = 5000;
-
-}  // namespace
-
 namespace content {
 
 WebRtcAudioDeviceNotImpl::WebRtcAudioDeviceNotImpl()
     : last_process_time_(base::TimeTicks::Now()) {
 }
 
 int32_t WebRtcAudioDeviceNotImpl::ChangeUniqueId(const int32_t id) {
   return 0;
 }
 
-int32_t WebRtcAudioDeviceNotImpl::TimeUntilNextProcess() {
+int64_t WebRtcAudioDeviceNotImpl::TimeUntilNextProcess() {
+  const int64_t kMillisecondsBetweenProcessCalls = 5000;
   base::TimeDelta delta_time = (base::TimeTicks::Now() - last_process_time_);
-  int64 time_until_next =
-      kMillisecondsBetweenProcessCalls - delta_time.InMilliseconds();
-  return static_cast<int32_t>(time_until_next);
+  return kMillisecondsBetweenProcessCalls - delta_time.InMilliseconds();
 }
 
 int32_t WebRtcAudioDeviceNotImpl::Process() {
   last_process_time_ = base::TimeTicks::Now();
   return 0;
 }
 
 int32_t WebRtcAudioDeviceNotImpl::RegisterEventObserver(
     webrtc::AudioDeviceObserver* event_callback) {
   return 0;
@@ skipping 238 matching lines @@
 
 bool WebRtcAudioDeviceNotImpl::BuiltInAECIsAvailable() const {
   return false;
 }
 
 int32_t WebRtcAudioDeviceNotImpl::EnableBuiltInAEC(bool enable) {
   return 0;
 }
 
 }  // namespace content