Revert 275781 "Revert 273044 "Change kEnableAudioTrackProcessing..."

trunk/src/content/renderer/media/webrtc/peer_connection_dependency_factory.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/media/webrtc/peer_connection_dependency_factory.h"
 
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/synchronization/waitable_event.h"
 #include "content/common/media/media_stream_messages.h"
 #include "content/public/common/content_switches.h"
 #include "content/renderer/media/media_stream.h"
+#include "content/renderer/media/media_stream_audio_processor.h"
 #include "content/renderer/media/media_stream_audio_processor_options.h"
 #include "content/renderer/media/media_stream_audio_source.h"
 #include "content/renderer/media/media_stream_video_source.h"
 #include "content/renderer/media/media_stream_video_track.h"
 #include "content/renderer/media/peer_connection_identity_service.h"
 #include "content/renderer/media/rtc_media_constraints.h"
 #include "content/renderer/media/rtc_peer_connection_handler.h"
 #include "content/renderer/media/rtc_video_decoder_factory.h"
 #include "content/renderer/media/rtc_video_encoder_factory.h"
 #include "content/renderer/media/webaudio_capturer_source.h"
@@ skipping 594 matching lines @@
   IPC_END_MESSAGE_MAP()
   return handled;
 }
 
 void PeerConnectionDependencyFactory::OnAecDumpFile(
     IPC::PlatformFileForTransit file_handle) {
   DCHECK(!aec_dump_file_.IsValid());
   base::File file = IPC::PlatformFileForTransitToFile(file_handle);
   DCHECK(file.IsValid());
 
-  if (CommandLine::ForCurrentProcess()->HasSwitch(
-          switches::kEnableAudioTrackProcessing)) {
+  if (MediaStreamAudioProcessor::IsAudioTrackProcessingEnabled()) {
     EnsureWebRtcAudioDeviceImpl();
     GetWebRtcAudioDevice()->EnableAecDump(file.Pass());
     return;
   }
 
-  // TODO(xians): Remove the following code after kEnableAudioTrackProcessing
+  // TODO(xians): Remove the following code after kDisableAudioTrackProcessing
   // is removed.
   if (PeerConnectionFactoryCreated())
     StartAecDump(file.Pass());
   else
     aec_dump_file_ = file.Pass();
 }
 
 void PeerConnectionDependencyFactory::OnDisableAecDump() {
-  if (CommandLine::ForCurrentProcess()->HasSwitch(
-          switches::kEnableAudioTrackProcessing)) {
+  if (MediaStreamAudioProcessor::IsAudioTrackProcessingEnabled()) {
     // Do nothing if OnAecDumpFile() has never been called.
     if (GetWebRtcAudioDevice())
       GetWebRtcAudioDevice()->DisableAecDump();
     return;
   }
 
-  // TODO(xians): Remove the following code after kEnableAudioTrackProcessing
+  // TODO(xians): Remove the following code after kDisableAudioTrackProcessing
   // is removed.
   if (aec_dump_file_.IsValid())
     aec_dump_file_.Close();
 }
 
 void PeerConnectionDependencyFactory::StartAecDump(base::File aec_dump_file) {
   // |pc_factory_| always takes ownership of |aec_dump_file|. If StartAecDump()
   // fails, |aec_dump_file| will be closed.
   if (!GetPcFactory()->StartAecDump(aec_dump_file.TakePlatformFile()))
     VLOG(1) << "Could not start AEC dump.";
 }
 
 void PeerConnectionDependencyFactory::EnsureWebRtcAudioDeviceImpl() {
   if (audio_device_)
     return;
 
   audio_device_ = new WebRtcAudioDeviceImpl();
 }
 
 }  // namespace content