Cleanup: media_stream_api.* ==> media_stream_utils.*

TEST=all unittests and LayoutTests passing.

Review URL: https://codereview.chromium.org/1773273007

Cr-Commit-Position: refs/heads/master@{#382026}

2 files changed, 13 insertions, 8 deletions

diff --git a/content/public/renderer/media_stream_api.cc b/content/public/renderer/media_stream_utils.cc
index a1cc697..d486541 100644
--- a/content/public/renderer/media_stream_api.cc
+++ b/content/public/renderer/media_stream_utils.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "content/public/renderer/media_stream_api.h"
+#include "content/public/renderer/media_stream_utils.h"
 
 #include <utility>
 
@@ -16,11 +16,11 @@
 #include "content/renderer/media/media_stream_video_source.h"
 #include "content/renderer/media/media_stream_video_track.h"
 #include "content/renderer/render_thread_impl.h"
+#include "media/base/audio_capturer_source.h"
+#include "media/base/video_capturer_source.h"
 #include "third_party/WebKit/public/platform/WebMediaStream.h"
 #include "third_party/WebKit/public/platform/WebMediaStreamSource.h"
-#include "third_party/WebKit/public/platform/WebURL.h"
 #include "third_party/WebKit/public/web/WebMediaStreamRegistry.h"
-#include "url/gurl.h"
 
 namespace content {
 
diff --git a/content/public/renderer/media_stream_api.h b/content/public/renderer/media_stream_utils.h
index 907415c..5df43ed 100644
--- a/content/public/renderer/media_stream_api.h
+++ b/content/public/renderer/media_stream_utils.h
@@ -2,20 +2,25 @@
 // 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_capture_types.h"
-#include "media/base/video_capturer_source.h"
 
 namespace blink {
 class WebMediaStream;
 class WebMediaStreamTrack;
 }
 
+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 +
@@ -51,4 +56,4 @@ CONTENT_EXPORT const media::VideoCaptureFormat* GetCurrentVideoTrackFormat(
 
 }  // namespace content
 
-#endif  // CONTENT_PUBLIC_RENDERER_MEDIA_STREAM_API_H_
+#endif  // CONTENT_PUBLIC_RENDERER_MEDIA_STREAM_UTILS_H_