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

chrome/renderer/chrome_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 "chrome/renderer/chrome_content_renderer_client.h"
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
 #include "base/path_service.h"
@@ skipping 445 matching lines @@
 }
 
 WebPlugin* ChromeContentRendererClient::CreatePluginReplacement(
     content::RenderView* render_view,
     const base::FilePath& plugin_path) {
   PluginPlaceholder* placeholder =
       PluginPlaceholder::CreateErrorPlugin(render_view, plugin_path);
   return placeholder->plugin();
 }
 
-webkit_media::WebMediaPlayerImpl*
+content::WebMediaPlayerImpl*
 ChromeContentRendererClient::OverrideCreateWebMediaPlayer(
     content::RenderView* render_view,
     WebKit::WebFrame* frame,
     WebKit::WebMediaPlayerClient* client,
-    base::WeakPtr<webkit_media::WebMediaPlayerDelegate> delegate,
-    const webkit_media::WebMediaPlayerParams& params) {
+    base::WeakPtr<content::WebMediaPlayerDelegate> delegate,
+    const content::WebMediaPlayerParams& params) {
 #if defined(OS_ANDROID)
   // Chromium for Android doesn't support prerender yet.
   return NULL;
 #else
   if (!prerender::PrerenderHelper::IsPrerendering(render_view))
     return NULL;
 
   return new prerender::PrerenderWebMediaPlayer(
       render_view, frame, client, delegate, params);
 #endif
@@ skipping 796 matching lines @@
   if (CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kEnablePepperTesting)) {
     return true;
   }
 #endif  // !defined(OS_ANDROID)
   return false;
 }
 
 
 }  // namespace chrome