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

content/public/renderer/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/public/renderer/content_renderer_client.h"
 
 namespace content {
 
 SkBitmap* ContentRendererClient::GetSadPluginBitmap() {
   return NULL;
@@ skipping 19 matching lines @@
     RenderView* render_view,
     const base::FilePath& plugin_path) {
   return NULL;
 }
 
 bool ContentRendererClient::HasErrorPage(int http_status_code,
                                          std::string* error_domain) {
   return false;
 }
 
-webkit_media::WebMediaPlayerImpl*
-ContentRendererClient::OverrideCreateWebMediaPlayer(
-    RenderView* render_view,
-    WebKit::WebFrame* frame,
-    WebKit::WebMediaPlayerClient* client,
-    base::WeakPtr<webkit_media::WebMediaPlayerDelegate> delegate,
-    const webkit_media::WebMediaPlayerParams& params) {
-  return NULL;
+void ContentRendererClient::DeferMediaLoad(RenderView* render_view,
+                                           const base::Closure& closure) {
+  closure.Run();
 }
 
 WebKit::WebMediaStreamCenter*
 ContentRendererClient::OverrideCreateWebMediaStreamCenter(
     WebKit::WebMediaStreamCenterClient* client) {
   return NULL;
 }
 
 WebKit::WebRTCPeerConnectionHandler*
 ContentRendererClient::OverrideCreateWebRTCPeerConnectionHandler(
     WebKit::WebRTCPeerConnectionHandlerClient* client) {
   return NULL;
 }
 
+webkit_media::MediaStreamClient*
+ContentRendererClient::OverrideCreateMediaStreamClient() {
+  return NULL;
+}
+
 WebKit::WebMIDIAccessor*
 ContentRendererClient::OverrideCreateMIDIAccessor(
     WebKit::WebMIDIAccessorClient* client) {
   return NULL;
 }
 
 WebKit::WebClipboard* ContentRendererClient::OverrideWebClipboard() {
   return NULL;
 }
 
@@ skipping 93 matching lines @@
 bool ContentRendererClient::AllowBrowserPlugin(
     WebKit::WebPluginContainer* container) const {
   return false;
 }
 
 bool ContentRendererClient::AllowPepperMediaStreamAPI(const GURL& url) const {
   return false;
 }
 
 }  // namespace content