Snapshot of all changes to get jumbo in blink and content.

content/renderer/pepper/pepper_media_stream_audio_track_host.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 "content/renderer/pepper/pepper_media_stream_audio_track_host.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/location.h"
@@ skipping 16 matching lines @@
 using ppapi::host::HostMessageContext;
 using ppapi::MediaStreamAudioTrackShared;
 
 namespace {
 
 // Audio buffer durations in milliseconds.
 const uint32_t kMinDuration = 10;
 const uint32_t kDefaultDuration = 10;
 
 const int32_t kDefaultNumberOfBuffers = 4;
-const int32_t kMaxNumberOfBuffers = 1000;  // 10 sec
+const int32_t kMaxNumberOfAudioBuffers = 1000;  // 10 sec
 
 // Returns true if the |sample_rate| is supported in
 // |PP_AudioBuffer_SampleRate|, otherwise false.
 PP_AudioBuffer_SampleRate GetPPSampleRate(int sample_rate) {
   switch (sample_rate) {
     case 8000:
       return PP_AUDIOBUFFER_SAMPLERATE_8000;
     case 16000:
       return PP_AUDIOBUFFER_SAMPLERATE_16000;
     case 22050:
@@ skipping 287 matching lines @@
                                                                    context);
 }
 
 int32_t PepperMediaStreamAudioTrackHost::OnHostMsgConfigure(
     HostMessageContext* context,
     const MediaStreamAudioTrackShared::Attributes& attributes) {
   if (!MediaStreamAudioTrackShared::VerifyAttributes(attributes))
     return PP_ERROR_BADARGUMENT;
 
   int32_t buffers = attributes.buffers
-                        ? std::min(kMaxNumberOfBuffers, attributes.buffers)
+                        ? std::min(kMaxNumberOfAudioBuffers, attributes.buffers)
                         : kDefaultNumberOfBuffers;
   return audio_sink_.Configure(buffers, attributes.duration,
                                context->MakeReplyMessageContext());
 }
 
 void PepperMediaStreamAudioTrackHost::OnClose() {
   if (connected_) {
     MediaStreamAudioSink::RemoveFromAudioTrack(&audio_sink_, track_);
     connected_ = false;
   }
@@ skipping 14 matching lines @@
     // can't happen until the sink is added to the audio track below.
     if (format.IsValid())
       audio_sink_.OnSetFormat(format);
 
     MediaStreamAudioSink::AddToAudioTrack(&audio_sink_, track_);
     connected_ = true;
   }
 }
 
 }  // namespace content