Revert 241151 "Make RenderFrameHostManager swap RenderFrameHosts..."

trunk/src/content/browser/renderer_host/media/web_contents_video_capture_device_unittest.cc

Index: trunk/src/content/browser/renderer_host/media/web_contents_video_capture_device_unittest.cc
===================================================================
--- trunk/src/content/browser/renderer_host/media/web_contents_video_capture_device_unittest.cc	(revision 241158)
+++ trunk/src/content/browser/renderer_host/media/web_contents_video_capture_device_unittest.cc	(working copy)
@@ -228,13 +228,14 @@
  public:
   CaptureTestRenderViewHost(SiteInstance* instance,
                             RenderViewHostDelegate* delegate,
+                            RenderFrameHostDelegate* frame_delegate,
                             RenderWidgetHostDelegate* widget_delegate,
                             int routing_id,
                             int main_frame_routing_id,
                             bool swapped_out,
                             CaptureTestSourceController* controller)
-      : TestRenderViewHost(instance, delegate, widget_delegate, routing_id,
-                           main_frame_routing_id, swapped_out),
+      : TestRenderViewHost(instance, delegate, frame_delegate, widget_delegate,
+                           routing_id, main_frame_routing_id, swapped_out),
         controller_(controller) {
     // Override the default view installed by TestRenderViewHost; we need
     // our special subclass which has mocked-out tab capture support.
@@ -289,13 +290,15 @@
   virtual RenderViewHost* CreateRenderViewHost(
       SiteInstance* instance,
       RenderViewHostDelegate* delegate,
+      RenderFrameHostDelegate* frame_delegate,
       RenderWidgetHostDelegate* widget_delegate,
       int routing_id,
       int main_frame_routing_id,
       bool swapped_out) OVERRIDE {
-    return new CaptureTestRenderViewHost(instance, delegate, widget_delegate,
-                                         routing_id, main_frame_routing_id,
-                                         swapped_out, controller_);
+    return new CaptureTestRenderViewHost(instance, delegate, frame_delegate,
+                                         widget_delegate, routing_id,
+                                         main_frame_routing_id, swapped_out,
+                                         controller_);
   }
  private:
   CaptureTestSourceController* controller_;