Enable media stream layout test with content_shell.

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 2658 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)
-  if (MediaStreamImpl::CheckMediaStream(url)) {
+  webkit_media::MediaStreamClient* media_stream_client =
+      GetContentClient()->renderer()->OverrideMediaStreamClient();
+  // For layout test with content_shell.

[jam, 2013/04/01 15:51:45]

nit: don't mention what an embedder might use this for.

+  if (media_stream_client) {
+    if (media_stream_client->IsMediaStream(url)) {
+      return new webkit_media::WebMediaPlayerMS(frame, client, AsWeakPtr(),
+          media_stream_client, new RenderMediaLog());
+    }
+  } else if (MediaStreamImpl::CheckMediaStream(url)) {
     EnsureMediaStreamImpl();
     return new webkit_media::WebMediaPlayerMS(
         frame, client, AsWeakPtr(), media_stream_impl_, new RenderMediaLog());
   }
 #endif
 
 #if defined(OS_ANDROID)
   GpuChannelHost* gpu_channel_host =
       RenderThreadImpl::current()->EstablishGpuChannelSync(
           CAUSE_FOR_GPU_LAUNCH_VIDEODECODEACCELERATOR_INITIALIZE);
@@ skipping 3616 matching lines @@
       WebKit::WebPageVisibilityStateVisible;
   WebKit::WebPageVisibilityState override_state = current_state;
   if (GetContentClient()->renderer()->
           ShouldOverridePageVisibilityState(this,
                                             &override_state))
     return override_state;
   return current_state;
 }
 
 WebKit::WebUserMediaClient* RenderViewImpl::userMediaClient() {
+  WebKit::WebUserMediaClient* user_media_client =
+      GetContentClient()->renderer()->OverrideUserMediaClient();
+  if (user_media_client)
+    return user_media_client;
+
   EnsureMediaStreamImpl();
   return media_stream_impl_;
 }
 
 void RenderViewImpl::draggableRegionsChanged() {
   FOR_EACH_OBSERVER(
       RenderViewObserver,
       observers_,
       DraggableRegionsChanged(webview()->mainFrame()));
 }
@@ skipping 282 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