Move creation of MediaStream renders from MediaStreamImpl to MediaStreamRenderFactory

content/test/layouttest_support.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/public/test/layouttest_support.h"
 
 #include "base/callback.h"
 #include "base/lazy_instance.h"
 #include "content/browser/renderer_host/render_widget_host_impl.h"
 #include "content/common/gpu/image_transport_surface.h"
 #include "content/public/common/page_state.h"
 #include "content/renderer/history_entry.h"
 #include "content/renderer/history_serialization.h"
 #include "content/renderer/render_frame_impl.h"
 #include "content/renderer/render_thread_impl.h"
 #include "content/renderer/render_view_impl.h"
 #include "content/renderer/renderer_webkitplatformsupport_impl.h"
 #include "content/shell/renderer/test_runner/TestCommon.h"
 #include "content/shell/renderer/test_runner/web_frame_test_proxy.h"
 #include "content/shell/renderer/test_runner/web_test_proxy.h"
-#include "content/test/test_media_stream_client.h"
 #include "third_party/WebKit/public/platform/WebDeviceMotionData.h"
 #include "third_party/WebKit/public/platform/WebDeviceOrientationData.h"
 #include "third_party/WebKit/public/platform/WebGamepads.h"
 #include "third_party/WebKit/public/web/WebHistoryItem.h"
 
 #if defined(OS_MACOSX)
 #include "content/browser/renderer_host/popup_menu_helper_mac.h"
 #endif
 
 using blink::WebDeviceMotionData;
@@ skipping 27 matching lines @@
 }
 
 RenderFrameImpl* CreateWebFrameTestProxy(
     RenderViewImpl* render_view,
     int32 routing_id) {
   typedef WebFrameTestProxy<RenderFrameImpl, RenderViewImpl*, int32> FrameProxy;
 
   FrameProxy* render_frame_proxy = new FrameProxy(render_view, routing_id);
   render_frame_proxy->set_base_proxy(GetWebTestProxyBase(render_view));
 
-  UseMockMediaStreams(render_frame_proxy);
-
   return render_frame_proxy;
 }
 
 }  // namespace
 
 
 void EnableWebTestProxyCreation(
     const base::Callback<void(RenderView*, WebTestProxyBase*)>& callback) {
   g_callback.Get() = callback;
   RenderViewImpl::InstallCreateHook(CreateWebTestProxy);
@@ skipping 152 matching lines @@
                           const WebSize& max_size) {
   static_cast<RenderViewImpl*>(render_view)->
       EnableAutoResizeForTesting(min_size, max_size);
 }
 
 void DisableAutoResizeMode(RenderView* render_view, const WebSize& new_size) {
   static_cast<RenderViewImpl*>(render_view)->
       DisableAutoResizeForTesting(new_size);
 }
 
-void UseMockMediaStreams(RenderFrame* render_frame) {
-  RenderFrameImpl* render_frame_impl = static_cast<RenderFrameImpl*>(
-      render_frame);
-  render_frame_impl->SetMediaStreamClientForTesting(
-      new TestMediaStreamClient(render_frame_impl));
-}
-
 struct ToLower {
   base::char16 operator()(base::char16 c) { return tolower(c); }
 };
 
 // Returns True if node1 < node2.
 bool HistoryEntryCompareLess(HistoryEntry::HistoryNode* node1,
                              HistoryEntry::HistoryNode* node2) {
   base::string16 target1 = node1->item().target();
   base::string16 target2 = node2->item().target();
   std::transform(target1.begin(), target1.end(), target1.begin(), ToLower());
@@ skipping 43 matching lines @@
     result.append(
         DumpHistoryItem(entry->root_history_node(),
                         8,
                         index == current_index));
   }
   result.append("===============================================\n");
   return result;
 }
 
 }  // namespace content