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

content/shell/renderer/shell_content_renderer_client.cc

 // Copyright (c) 2012 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.
 
 #include "content/shell/renderer/shell_content_renderer_client.h"
 
 #include "base/callback.h"
 #include "base/command_line.h"
 #include "base/debug/debugger.h"
 #include "content/public/common/content_constants.h"
 #include "content/public/common/content_switches.h"
 #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"
 #include "third_party/WebKit/public/testing/WebTestInterfaces.h"
 #include "third_party/WebKit/public/testing/WebTestProxy.h"
 #include "third_party/WebKit/public/testing/WebTestRunner.h"
 #include "third_party/WebKit/public/web/WebPluginParams.h"
 #include "third_party/WebKit/public/web/WebView.h"
 #include "v8/include/v8.h"
 #include "webkit/mocks/mock_webhyphenator.h"
@@ skipping 110 matching lines @@
     return NULL;
 #if defined(ENABLE_WEBRTC)
   WebTestInterfaces* interfaces =
       ShellRenderProcessObserver::GetInstance()->test_interfaces();
   return interfaces->createWebRTCPeerConnectionHandler(client);
 #else
   return NULL;
 #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) {
   WebTestInterfaces* interfaces =
       ShellRenderProcessObserver::GetInstance()->test_interfaces();
   return interfaces->createMIDIAccessor(client);
 }
 
 WebClipboard* ShellContentRendererClient::OverrideWebClipboard() {
   if (!CommandLine::ForCurrentProcess()->HasSwitch(switches::kDumpRenderTree))
@@ skipping 36 matching lines @@
   if (CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kEnableBrowserPluginForAllViewTypes)) {
     // Allow BrowserPlugin if forced by command line flag. This is generally
     // true for tests.
     return true;
   }
   return ContentRendererClient::AllowBrowserPlugin(container);
 }
 
 }  // namespace content