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

content/public/renderer/content_renderer_client.h

 // 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.
 
 #ifndef CONTENT_PUBLIC_RENDERER_CONTENT_RENDERER_CLIENT_H_
 #define CONTENT_PUBLIC_RENDERER_CONTENT_RENDERER_CLIENT_H_
 
 #include <string>
 
 #include "base/memory/weak_ptr.h"
@@ skipping 13 matching lines @@
 class FilePath;
 class MessageLoop;
 }
 
 namespace WebKit {
 class WebClipboard;
 class WebFrame;
 class WebHyphenator;
 class WebMIDIAccessor;
 class WebMIDIAccessorClient;
-class WebMediaPlayerClient;
 class WebMediaStreamCenter;
 class WebMediaStreamCenterClient;
 class WebPlugin;
 class WebPluginContainer;
 class WebPrescientNetworking;
 class WebRTCPeerConnectionHandler;
 class WebRTCPeerConnectionHandlerClient;
 class WebSpeechSynthesizer;
 class WebSpeechSynthesizerClient;
 class WebThemeEngine;
 class WebURLRequest;
 struct WebPluginParams;
 struct WebURLError;
 }
 
 namespace webkit {
 namespace ppapi {
 class PpapiInterfaceFactoryManager;
 }
 struct WebPluginInfo;
 }
 
-namespace webkit_media {
-class WebMediaPlayerDelegate;
-class WebMediaPlayerImpl;
-class WebMediaPlayerParams;
-}
-
 namespace content {
 
+class MediaPlayerLoadDelegate;
+class MediaStreamClient;
 class RenderView;
 class SynchronousCompositor;
 
 // Embedder API for participating in renderer logic.
 class CONTENT_EXPORT ContentRendererClient {
  public:
   virtual ~ContentRendererClient() {}
 
   // Notifies us that the RenderThread has been created.
   virtual void RenderThreadStarted() {}
@@ skipping 44 matching lines @@
   // Either of the out parameters may be not written to in certain cases
   // (lack of information on the error code) so the caller should take care to
   // initialize the string values with safe defaults before the call.
   virtual void GetNavigationErrorStrings(
       WebKit::WebFrame* frame,
       const WebKit::WebURLRequest& failed_request,
       const WebKit::WebURLError& error,
       std::string* error_html,
       string16* error_description) {}
 
-  // Allows embedder to override creating a WebMediaPlayerImpl. If it returns
-  // NULL the content layer will create the media player.
-  virtual webkit_media::WebMediaPlayerImpl* OverrideCreateWebMediaPlayer(
-      RenderView* render_view,
-      WebKit::WebFrame* frame,
-      WebKit::WebMediaPlayerClient* client,
-      base::WeakPtr<webkit_media::WebMediaPlayerDelegate> delegate,
-      const webkit_media::WebMediaPlayerParams& params);
+  // Allows the embedder to control when media resources are loaded. If it
+  // returns NULL no delegate will be used and media resources will always
+  // be loaded.
+  virtual MediaPlayerLoadDelegate* OverrideCreateMediaPlayerLoadDelegate(

[scherkus (not reviewing), 2013/06/28 06:04:41]

I'm not a content API pro by any means ... but this seems a bit strange that
every other method deals with WebKit:: interfaces yet I'm introducing two
content:: interface overrides here.

Am I Doing It Wrong(tm) or is this an OK place to put these methods? Is there a
better location for overriding content-ish objects as opposed to WebKit-ish
objects?

+      RenderView* render_view);
 
   // Allows the embedder to override creating a WebMediaStreamCenter. If it
   // returns NULL the content layer will create the stream center.
   virtual WebKit::WebMediaStreamCenter* OverrideCreateWebMediaStreamCenter(
       WebKit::WebMediaStreamCenterClient* client);
 
   // Allows the embedder to override creating a WebRTCPeerConnectionHandler. If
   // it returns NULL the content layer will create the connection handler.
   virtual WebKit::WebRTCPeerConnectionHandler*
   OverrideCreateWebRTCPeerConnectionHandler(
       WebKit::WebRTCPeerConnectionHandlerClient* client);
 
+  // Allows the embedder to override creating a MediaStreamClient. If it returns
+  // NULL the content layer will create the media stream client.
+  virtual MediaStreamClient* OverrideCreateMediaStreamClient();
+
   // Allows the embedder to override creating a WebMIDIAccessor.  If it
   // returns NULL the content layer will create the MIDI accessor.
   virtual WebKit::WebMIDIAccessor* OverrideCreateMIDIAccessor(
       WebKit::WebMIDIAccessorClient* client);
 
   // Allows the embedder to override the WebKit::WebClipboard used. If it
   // returns NULL the content layer will handle clipboard interactions.
   virtual WebKit::WebClipboard* OverrideWebClipboard();
 
   // Allows the embedder to override the WebKit::WebHyphenator used. If it
@@ skipping 88 matching lines @@
   // Returns whether BrowserPlugin should be allowed within the |container|.
   virtual bool AllowBrowserPlugin(WebKit::WebPluginContainer* container) const;
 
   // Returns true if the page at |url| can use Pepper MediaStream APIs.
   virtual bool AllowPepperMediaStreamAPI(const GURL& url) const;
 };
 
 }  // namespace content
 
 #endif  // CONTENT_PUBLIC_RENDERER_CONTENT_RENDERER_CLIENT_H_