Fixit: Move tab and desktop capture code to new location.

content/browser/renderer_host/media/audio_input_renderer_host.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/browser/renderer_host/media/audio_input_renderer_host.h"
 
 #include "base/bind.h"
 #include "base/memory/shared_memory.h"
 #include "base/metrics/histogram.h"
 #include "base/process/process.h"
+#include "content/browser/media/capture/web_contents_audio_input_stream.h"
+#include "content/browser/media/capture/web_contents_capture_util.h"
 #include "content/browser/media/media_internals.h"
 #include "content/browser/renderer_host/media/audio_input_device_manager.h"
 #include "content/browser/renderer_host/media/audio_input_sync_writer.h"
 #include "content/browser/renderer_host/media/media_stream_manager.h"
-#include "content/browser/renderer_host/media/web_contents_audio_input_stream.h"
-#include "content/browser/renderer_host/media/web_contents_capture_util.h"
 #include "media/audio/audio_manager_base.h"
 
 namespace content {
 
 struct AudioInputRendererHost::AudioEntry {
   AudioEntry();
   ~AudioEntry();
 
   // The AudioInputController that manages the audio input stream.
   scoped_refptr<media::AudioInputController> controller;
@@ skipping 244 matching lines @@
     return;
   }
 
   // If we have successfully created the SyncWriter then assign it to the
   // entry and construct an AudioInputController.
   entry->writer.reset(writer.release());
   if (WebContentsCaptureUtil::IsWebContentsDeviceId(device_id)) {
     entry->controller = media::AudioInputController::CreateForStream(
         audio_manager_->GetTaskRunner(),
         this,
         WebContentsAudioInputStream::Create(

[scherkus (not reviewing), 2014/02/20 18:46:56]

I forget the details of the renderer_host-can't-depend-on-web_contents
discussion ... but is it still considered a layering violaton if
renderer_host/media/ code is able to use web_contents code via these classes?

[miu, 2014/02/20 21:29:03]

I forget the details too.  ;-)  My understanding, based on looking at the bug
and code history, is that the restriction was put in-place to drive clean code
organization rather than force the object dependency graph.

In fact, we can never force such an object dependency graph without adding
[useless] layers of indirection, since tab capture is literally the recording of
audio and video from a "WebContents."

             device_id,
             audio_params,
             audio_manager_->GetWorkerTaskRunner(),
             audio_mirroring_manager_),
         entry->writer.get(),
         user_input_monitor_);
   } else {
     // TODO(henrika): replace CreateLowLatency() with Create() as soon
     // as satish has ensured that Speech Input also uses the default low-
     // latency path. See crbug.com/112472 for details.
@@ skipping 125 matching lines @@
   // TODO(hclam): Implement a faster look up method.
   for (AudioEntryMap::iterator i = audio_entries_.begin();
        i != audio_entries_.end(); ++i) {
     if (controller == i->second->controller.get())
       return i->second;
   }
   return NULL;
 }
 
 }  // namespace content