Migrate webkit/renderer/media/ to content/renderer/media/.

content/shell/renderer/shell_content_renderer_client.cc

Index: content/shell/renderer/shell_content_renderer_client.cc
diff --git a/content/shell/renderer/shell_content_renderer_client.cc b/content/shell/renderer/shell_content_renderer_client.cc
index 3161beb5219752bd755b25103bc45be33e08d9fb..a54de699454f61606142f32c478f2723a76fd287 100644
--- a/content/shell/renderer/shell_content_renderer_client.cc
+++ b/content/shell/renderer/shell_content_renderer_client.cc
@@ -12,6 +12,7 @@
 #include "content/public/renderer/render_view.h"
 #include "content/public/test/layouttest_support.h"
 #include "content/shell/common/shell_switches.h"
+#include "content/shell/renderer/shell_media_stream_client.h"
 #include "content/shell/renderer/shell_render_process_observer.h"
 #include "content/shell/renderer/webkit_test_runner.h"
 #include "third_party/WebKit/public/platform/WebMediaStreamCenter.h"
@@ -142,6 +143,13 @@ ShellContentRendererClient::OverrideCreateWebRTCPeerConnectionHandler(
 #endif
 }
 
+webkit_media::MediaStreamClient*
+ShellContentRendererClient::OverrideCreateMediaStreamClient() {
+  if (!shell_media_stream_client_)

[ddorwin, 2013/06/29 01:38:30]

Is there a reason this would be called multiple times?

[scherkus (not reviewing), 2013/07/02 01:46:23]

gets called every time we're creating a MediaStream-based WebMediaPlayer

+    shell_media_stream_client_.reset(new ShellMediaStreamClient());
+  return shell_media_stream_client_.get();
+}
+
 WebMIDIAccessor*
 ShellContentRendererClient::OverrideCreateMIDIAccessor(
     WebMIDIAccessorClient* client) {