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

content/renderer/render_view_impl.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/renderer/render_view_impl.h"
 
 #include <algorithm>
 #include <cmath>
 
 #include "base/auto_reset.h"
@@ skipping 2834 matching lines @@
   }
 }
 
 WebMediaPlayer* RenderViewImpl::createMediaPlayer(
     WebFrame* frame, const WebKit::WebURL& url, WebMediaPlayerClient* client) {
   FOR_EACH_OBSERVER(
       RenderViewObserver, observers_, WillCreateMediaPlayer(frame, client));
 
   const CommandLine* cmd_line = CommandLine::ForCurrentProcess();
 #if defined(ENABLE_WEBRTC) && !defined(GOOGLE_TV)
-  if (MediaStreamImpl::CheckMediaStream(url)) {
+  webkit_media::MediaStreamClient* media_stream_client =
+      GetContentClient()->renderer()->OverrideCreateMediaStreamClient();
+  if (!media_stream_client) {
+    EnsureMediaStreamImpl();
+    media_stream_client = media_stream_impl_;
+  }
+
+  if (media_stream_client->IsMediaStream(url)) {
 #if defined(OS_ANDROID) && defined(ARCH_CPU_ARMEL)
     bool found_neon =
         (android_getCpuFeatures() & ANDROID_CPU_ARM_FEATURE_NEON) != 0;
     UMA_HISTOGRAM_BOOLEAN("Platform.WebRtcNEONFound", found_neon);
 #endif  // defined(OS_ANDROID) && defined(ARCH_CPU_ARMEL)
     EnsureMediaStreamImpl();

[ycheo (away), 2013/07/03 02:41:04]

QQ) Is this needed?
If it is, should we use 'media_stream_impl_' in L2870?

[scherkus (not reviewing), 2013/07/03 20:10:30]

no it is no longer needed

     return new webkit_media::WebMediaPlayerMS(
-        frame, client, AsWeakPtr(), media_stream_impl_, new RenderMediaLog());
+        frame, client, AsWeakPtr(), media_stream_client, new RenderMediaLog());
   }
 #endif
 
 #if defined(OS_ANDROID)
   GpuChannelHost* gpu_channel_host =
       RenderThreadImpl::current()->EstablishGpuChannelSync(
           CAUSE_FOR_GPU_LAUNCH_VIDEODECODEACCELERATOR_INITIALIZE);
   if (!gpu_channel_host) {
     LOG(ERROR) << "Failed to establish GPU channel for media player";
     return NULL;
@@ skipping 59 matching lines @@
       factories_loop = base::MessageLoopProxy::current();
     GpuChannelHost* gpu_channel_host =
         RenderThreadImpl::current()->EstablishGpuChannelSync(
             CAUSE_FOR_GPU_LAUNCH_VIDEODECODEACCELERATOR_INITIALIZE);
     gpu_factories = new RendererGpuVideoDecoderFactories(
         gpu_channel_host, factories_loop, context3d);
   }
 
   webkit_media::WebMediaPlayerParams params(
       RenderThreadImpl::current()->GetMediaThreadMessageLoopProxy(),
-      sink, gpu_factories, new RenderMediaLog());
-  WebMediaPlayer* media_player =
-      GetContentClient()->renderer()->OverrideCreateWebMediaPlayer(
-          this, frame, client, AsWeakPtr(), params);
-  if (!media_player) {
-    media_player = new webkit_media::WebMediaPlayerImpl(
-        frame, client, AsWeakPtr(), params);
-  }
-  return media_player;
+      base::Bind(&ContentRendererClient::DeferMediaLoad,
+                 base::Unretained(GetContentClient()->renderer()),
+                 static_cast<RenderView*>(this)),
+      sink,
+      gpu_factories,
+      new RenderMediaLog());
+  return new webkit_media::WebMediaPlayerImpl(
+      frame, client, AsWeakPtr(), params);
 }
 
 WebApplicationCacheHost* RenderViewImpl::createApplicationCacheHost(
     WebFrame* frame, WebApplicationCacheHostClient* client) {
   if (!frame || !frame->view())
     return NULL;
   return new RendererWebApplicationCacheHostImpl(
       FromWebView(frame->view()), client,
       RenderThreadImpl::current()->appcache_dispatcher()->backend_proxy());
 }
@@ skipping 3816 matching lines @@
     WebURL url = icon_urls[i].iconURL();
     if (!url.isEmpty())
       urls.push_back(FaviconURL(url,
                                 ToFaviconType(icon_urls[i].iconType())));
   }
   SendUpdateFaviconURL(urls);
 }
 
 
 }  // namespace content