Cleanup: media_stream_api.* ==> media_stream_utils.*

content/public/renderer/media_stream_utils.h

 // Copyright 2015 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.
 
-#ifndef CONTENT_PUBLIC_RENDERER_MEDIA_STREAM_API_H_
-#define CONTENT_PUBLIC_RENDERER_MEDIA_STREAM_API_H_
+#ifndef CONTENT_PUBLIC_RENDERER_MEDIA_STREAM_UTILS_H_
+#define CONTENT_PUBLIC_RENDERER_MEDIA_STREAM_UTILS_H_
 
+#include "base/memory/ref_counted.h"
+#include "base/memory/scoped_ptr.h"
 #include "content/common/content_export.h"
-#include "media/base/audio_capturer_source.h"
 #include "media/base/channel_layout.h"
-#include "media/base/video_capturer_source.h"
 
 namespace blink {
 class WebMediaStream;
 }
 
+namespace media {
+class AudioCapturerSource;
+class VideoCapturerSource;
+}
+
 namespace content {
 // These methods create a WebMediaStreamSource + MediaStreamSource pair with the
 // provided audio or video capturer source. A new WebMediaStreamTrack +
 // MediaStreamTrack pair is created, connected to the source and is plugged into
 // the WebMediaStream (|web_media_stream|).
 // |is_remote| should be true if the source of the data is not a local device.
 // |is_readonly| should be true if the format of the data cannot be changed by
 //     MediaTrackConstraints.
 CONTENT_EXPORT bool AddVideoTrackToMediaStream(
     scoped_ptr<media::VideoCapturerSource> video_source,
     bool is_remote,
     bool is_readonly,
     blink::WebMediaStream* web_media_stream);
 
 // |sample_rate|, |channel_layout|, and |frames_per_buffer| specify the audio
 // parameters of the track. Generally, these should match the |audio_source| so
 // that it does not have to perform unnecessary sample rate conversion or
 // channel mixing.
 CONTENT_EXPORT bool AddAudioTrackToMediaStream(
     scoped_refptr<media::AudioCapturerSource> audio_source,

[tommi (sloooow) - chröme, 2016/03/16 19:01:11]

this should be by const & or pass a pointer to media::AudioCapturerSource as per
recent discussion on chromium-dev.

[mcasas, 2016/03/18 01:41:28]

Added a TODO: it's beyond the reach of this CL
since it affects also callers and callees [1].

[1]
https://code.google.com/p/chromium/codesearch#chromium/src/content/renderer/m...


Correction: I know the discussion you're talking
about but I read this in the Chromium StyleGuide:

"If the function (at least sometimes) takes a ref
on a refcounted object, declare the param as 
scoped_refptr<T>. The caller can decide whether it 
wishes to transfer ownership (by calling std::move(t)
when passing t) or retain its ref (by simply 
passing t directly)."

https://www.chromium.org/developers/coding-style#TOC-Object-ownership-and-cal...

In that sense the current signature is correct.

More interesting is that the AudioCapturerSource
is a scoped_refptr<> but I took a first look and
seems like it could be scoped_ptr<> instead.

So I'll commit like this, please let me know if
you'd still like me to write a TODO and/or follow up.

     int sample_rate,
     media::ChannelLayout channel_layout,
     int frames_per_buffer,
     bool is_remote,
     bool is_readonly,
     blink::WebMediaStream* web_media_stream);
 
 }  // namespace content
 
-#endif  // CONTENT_PUBLIC_RENDERER_MEDIA_STREAM_API_H_
+#endif  // CONTENT_PUBLIC_RENDERER_MEDIA_STREAM_UTILS_H_