7 files changed, 23 insertions, 16 deletions
diff --git a/chrome/renderer/extensions/cast_streaming_native_handler.cc b/chrome/renderer/extensions/cast_streaming_native_handler.cc
index 72bf805..6695ef4 100644
--- a/chrome/renderer/extensions/cast_streaming_native_handler.cc
+++ b/chrome/renderer/extensions/cast_streaming_native_handler.cc
@@ -27,7 +27,7 @@
 #include "chrome/renderer/media/cast_session.h"
 #include "chrome/renderer/media/cast_udp_transport.h"
 #include "content/public/child/v8_value_converter.h"
-#include "content/public/renderer/media_stream_api.h"
+#include "content/public/renderer/media_stream_utils.h"
 #include "extensions/renderer/script_context.h"
 #include "media/audio/audio_parameters.h"
 #include "net/base/host_port_pair.h"
diff --git a/content/content_renderer.gypi b/content/content_renderer.gypi
index c8d478c..ca82da8 100644
--- a/content/content_renderer.gypi
+++ b/content/content_renderer.gypi
@@ -181,14 +181,14 @@
       'renderer/dom_storage/dom_storage_dispatcher.cc',
       'renderer/dom_storage/dom_storage_dispatcher.h',
       'renderer/dom_storage/dom_storage_proxy.h',
-      'renderer/dom_storage/local_storage_namespace.cc',
-      'renderer/dom_storage/local_storage_namespace.h',
       'renderer/dom_storage/local_storage_area.cc',
       'renderer/dom_storage/local_storage_area.h',
       'renderer/dom_storage/local_storage_cached_area.cc',
       'renderer/dom_storage/local_storage_cached_area.h',
       'renderer/dom_storage/local_storage_cached_areas.cc',
       'renderer/dom_storage/local_storage_cached_areas.h',
+      'renderer/dom_storage/local_storage_namespace.cc',
+      'renderer/dom_storage/local_storage_namespace.h',
       'renderer/dom_storage/webstoragearea_impl.cc',
       'renderer/dom_storage/webstoragearea_impl.h',
       'renderer/dom_storage/webstoragenamespace_impl.cc',
@@ -631,9 +631,9 @@
       'renderer/render_widget_fullscreen_pepper.h',
     ],
     'public_renderer_webrtc_sources': [
-      'public/renderer/media_stream_api.cc',
-      'public/renderer/media_stream_api.h',
       'public/renderer/media_stream_renderer_factory.h',
+      'public/renderer/media_stream_utils.cc',
+      'public/renderer/media_stream_utils.h',
       'public/renderer/media_stream_video_sink.cc',
       'public/renderer/media_stream_video_sink.h',
       'public/renderer/webrtc_log_message_delegate.h',
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_
diff --git a/content/renderer/renderer_blink_platform_impl.cc b/content/renderer/renderer_blink_platform_impl.cc
index 16c36c6..2de292d 100644
--- a/content/renderer/renderer_blink_platform_impl.cc
+++ b/content/renderer/renderer_blink_platform_impl.cc
@@ -51,7 +51,7 @@
 #include "content/public/common/service_registry.h"
 #include "content/public/common/webplugininfo.h"
 #include "content/public/renderer/content_renderer_client.h"
-#include "content/public/renderer/media_stream_api.h"
+#include "content/public/renderer/media_stream_utils.h"
 #include "content/renderer/cache_storage/webserviceworkercachestorage_impl.h"
 #include "content/renderer/device_sensors/device_light_event_pump.h"
 #include "content/renderer/device_sensors/device_motion_event_pump.h"
diff --git a/content/shell/renderer/layout_test/blink_test_runner.cc b/content/shell/renderer/layout_test/blink_test_runner.cc
index 2978630..149818f 100644
--- a/content/shell/renderer/layout_test/blink_test_runner.cc
+++ b/content/shell/renderer/layout_test/blink_test_runner.cc
@@ -36,7 +36,7 @@
 #include "content/public/common/content_switches.h"
 #include "content/public/common/url_constants.h"
 #include "content/public/common/web_preferences.h"
-#include "content/public/renderer/media_stream_api.h"
+#include "content/public/renderer/media_stream_utils.h"
 #include "content/public/renderer/render_frame.h"
 #include "content/public/renderer/render_view.h"
 #include "content/public/renderer/render_view_visitor.h"
@@ -49,6 +49,8 @@
 #include "content/shell/renderer/layout_test/layout_test_render_process_observer.h"
 #include "content/shell/renderer/layout_test/leak_detector.h"
 #include "media/audio/audio_parameters.h"
+#include "media/base/audio_capturer_source.h"
+#include "media/base/video_capturer_source.h"
 #include "net/base/filename_util.h"
 #include "net/base/net_errors.h"
 #include "skia/ext/platform_canvas.h"
diff --git a/extensions/renderer/api/display_source/wifi_display/wifi_display_media_manager.cc b/extensions/renderer/api/display_source/wifi_display/wifi_display_media_manager.cc
index 0724c61..4ac1a43 100644
--- a/extensions/renderer/api/display_source/wifi_display/wifi_display_media_manager.cc
+++ b/extensions/renderer/api/display_source/wifi_display/wifi_display_media_manager.cc
@@ -6,7 +6,7 @@
 
 #include "base/logging.h"
 #include "base/rand_util.h"
-#include "content/public/renderer/media_stream_api.h"
+#include "content/public/renderer/media_stream_utils.h"
 
 namespace extensions {