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 36 matching lines @@
 struct WebURLError;
 }
 
 namespace webkit {
 namespace ppapi {
 class PpapiInterfaceFactoryManager;
 }
 struct WebPluginInfo;
 }
 
-namespace webkit_media {
-class WebMediaPlayerDelegate;
-class WebMediaPlayerImpl;
-class WebMediaPlayerParams;
-}
-
 namespace content {
 
 class RenderView;
 class SynchronousCompositor;
+class WebMediaPlayerDelegate;
+class WebMediaPlayerImpl;
+class WebMediaPlayerParams;
 
 // 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() {}
 
   // Notifies that a new RenderView has been created.
@@ skipping 44 matching lines @@
   // 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(
+  virtual WebMediaPlayerImpl* OverrideCreateWebMediaPlayer(
       RenderView* render_view,
       WebKit::WebFrame* frame,
       WebKit::WebMediaPlayerClient* client,
-      base::WeakPtr<webkit_media::WebMediaPlayerDelegate> delegate,
-      const webkit_media::WebMediaPlayerParams& params);
+      base::WeakPtr<WebMediaPlayerDelegate> delegate,
+      const WebMediaPlayerParams& params);
 
   // 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(
@@ skipping 100 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_