| Index: content/browser/renderer_host/media/media_stream_manager.cc
|
| diff --git a/content/browser/renderer_host/media/media_stream_manager.cc b/content/browser/renderer_host/media/media_stream_manager.cc
|
| index f35c8dc5233a56751b1dd6a6d7677174b6ad11d3..49d1cbd407c3ce4c314fede9126f376242e2668a 100644
|
| --- a/content/browser/renderer_host/media/media_stream_manager.cc
|
| +++ b/content/browser/renderer_host/media/media_stream_manager.cc
|
| @@ -22,7 +22,6 @@
|
| #include "base/threading/thread.h"
|
| #include "base/threading/thread_local.h"
|
| #include "content/browser/browser_main_loop.h"
|
| -#include "content/browser/media/capture/web_contents_capture_util.h"
|
| #include "content/browser/renderer_host/media/audio_input_device_manager.h"
|
| #include "content/browser/renderer_host/media/audio_output_device_enumerator.h"
|
| #include "content/browser/renderer_host/media/media_capture_devices_impl.h"
|
| @@ -35,6 +34,7 @@
|
| #include "content/public/browser/media_observer.h"
|
| #include "content/public/browser/media_request_state.h"
|
| #include "content/public/browser/render_process_host.h"
|
| +#include "content/public/browser/web_contents_media_capture_id.h"
|
| #include "content/public/common/content_client.h"
|
| #include "content/public/common/content_switches.h"
|
| #include "content/public/common/media_stream_request.h"
|
| @@ -1313,7 +1313,7 @@ bool MediaStreamManager::SetupTabCaptureRequest(DeviceRequest* request) {
|
| int target_render_process_id = 0;
|
| int target_render_frame_id = 0;
|
|
|
| - bool has_valid_device_id = WebContentsCaptureUtil::ExtractTabCaptureTarget(
|
| + bool has_valid_device_id = WebContentsMediaCaptureId::ExtractTabCaptureTarget(
|
| capture_device_id, &target_render_process_id, &target_render_frame_id);
|
| if (!has_valid_device_id ||
|
| (request->audio_type() != MEDIA_TAB_AUDIO_CAPTURE &&
|
|
|