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

content/renderer/media/webrtc/processed_local_audio_source.cc

 // Copyright (c) 2012 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/processed_local_audio_source.h"
 
 #include <algorithm>
 #include <utility>
 
 #include "base/logging.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/strings/stringprintf.h"
 #include "content/renderer/media/audio_device_factory.h"
 #include "content/renderer/media/media_stream_audio_processor_options.h"
 #include "content/renderer/media/media_stream_constraints_util.h"
 #include "content/renderer/media/webrtc/peer_connection_dependency_factory.h"
 #include "content/renderer/media/webrtc_audio_device_impl.h"
 #include "content/renderer/media/webrtc_logging.h"
 #include "content/renderer/render_frame_impl.h"
 #include "media/base/channel_layout.h"
 #include "media/base/sample_rates.h"
 #include "third_party/webrtc/api/mediaconstraintsinterface.h"
 #include "third_party/webrtc/media/base/mediachannel.h"
 
 namespace content {
 
 namespace {
 // Used as an identifier for ProcessedLocalAudioSource::From().
-void* const kClassIdentifier = const_cast<void**>(&kClassIdentifier);
+void* const kPLASClassIdentifier = const_cast<void**>(&kPLASClassIdentifier);
 }  // namespace
 
 ProcessedLocalAudioSource::ProcessedLocalAudioSource(
     int consumer_render_frame_id,
     const MediaStreamDevice& device,
     const AudioProcessingProperties& audio_processing_properties,
     const ConstraintsCallback& started_callback,
     PeerConnectionDependencyFactory* factory)
     : MediaStreamAudioSource(true /* is_local_source */),
       consumer_render_frame_id_(consumer_render_frame_id),
       pc_factory_(factory),
       audio_processing_properties_(audio_processing_properties),
       started_callback_(started_callback),
       volume_(0),
       allow_invalid_render_frame_id_for_testing_(false) {
   DCHECK(pc_factory_);
   DVLOG(1) << "ProcessedLocalAudioSource::ProcessedLocalAudioSource()";
   SetDevice(device);
 }
 
 ProcessedLocalAudioSource::~ProcessedLocalAudioSource() {
   DVLOG(1) << "ProcessedLocalAudioSource::~ProcessedLocalAudioSource()";
   EnsureSourceIsStopped();
 }
 
 // static
 ProcessedLocalAudioSource* ProcessedLocalAudioSource::From(
     MediaStreamAudioSource* source) {
-  if (source && source->GetClassIdentifier() == kClassIdentifier)
+  if (source && source->GetClassIdentifier() == kPLASClassIdentifier)
     return static_cast<ProcessedLocalAudioSource*>(source);
   return nullptr;
 }
 
 void* ProcessedLocalAudioSource::GetClassIdentifier() const {
-  return kClassIdentifier;
+  return kPLASClassIdentifier;
 }
 
 bool ProcessedLocalAudioSource::EnsureSourceIsStarted() {
   DCHECK(thread_checker_.CalledOnValidThread());
 
   {
     base::AutoLock auto_lock(source_lock_);
     if (source_)
       return true;
   }
@@ skipping 281 matching lines @@
 
   // If the buffer size is missing from the MediaStreamDevice, provide 10ms as a
   // fall-back.
   //
   // TODO(miu): Identify where/why the buffer size might be missing, fix the
   // code, and then require it here. http://crbug.com/638081
   return (sample_rate / 100);
 }
 
 }  // namespace content