Revert 241151 "Make RenderFrameHostManager swap RenderFrameHosts..."

trunk/src/content/test/test_render_view_host.h

 // 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.
 
 #ifndef CONTENT_TEST_TEST_RENDER_VIEW_HOST_H_
 #define CONTENT_TEST_TEST_RENDER_VIEW_HOST_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 17 matching lines @@
 
 struct ViewHostMsg_FrameNavigate_Params;
 
 namespace gfx {
 class Rect;
 }
 
 namespace content {
 
 class SiteInstance;
-class TestRenderFrameHost;
 class TestWebContents;
 
 // Utility function to initialize ViewHostMsg_NavigateParams_Params
 // with given |page_id|, |url| and |transition_type|.
 void InitNavigateParams(ViewHostMsg_FrameNavigate_Params* params,
                         int page_id,
                         const GURL& url,
                         PageTransition transition_type);
 
 // TestRenderViewHostView ------------------------------------------------------
@@ skipping 179 matching lines @@
 // The reason we do it this way instead of using composition is
 // similar to (b) above, essentially it gets very tricky.  By using
 // the split interface we avoid complexity within content and maintain
 // reasonable utility for embedders.
 class TestRenderViewHost
     : public RenderViewHostImpl,
       public RenderViewHostTester {
  public:
   TestRenderViewHost(SiteInstance* instance,
                      RenderViewHostDelegate* delegate,
+                     RenderFrameHostDelegate* frame_delegate,
                      RenderWidgetHostDelegate* widget_delegate,
                      int routing_id,
                      int main_frame_routing_id,
                      bool swapped_out);
   virtual ~TestRenderViewHost();
 
   // RenderViewHostTester implementation.  Note that CreateRenderView
   // is not specified since it is synonymous with the one from
   // RenderViewHostImpl, see below.
   virtual void SendNavigate(int page_id, const GURL& url) OVERRIDE;
@@ skipping 59 matching lines @@
   void set_simulate_fetch_via_proxy(bool proxy);
 
   // If set, navigations will appear to have cleared the history list in the
   // RenderView (ViewHostMsg_FrameNavigate_Params::history_list_was_cleared).
   // False by default.
   void set_simulate_history_list_was_cleared(bool cleared);
 
   // The opener route id passed to CreateRenderView().
   int opener_route_id() const { return opener_route_id_; }
 
-  // TODO(creis): Remove the need for these methods.
-  TestRenderFrameHost* main_render_frame_host() const {
-    return main_render_frame_host_;
-  }
-  void set_main_render_frame_host(TestRenderFrameHost* rfh) {
-    main_render_frame_host_ = rfh;
-  }
-
   // RenderViewHost overrides --------------------------------------------------
 
   virtual bool CreateRenderView(const base::string16& frame_name,
                                 int opener_route_id,
                                 int32 max_page_id) OVERRIDE;
   virtual bool IsRenderViewLive() const OVERRIDE;
 
  private:
   FRIEND_TEST_ALL_PREFIXES(RenderViewHostTest, FilterNavigate);
 
@@ skipping 25 matching lines @@
 
   // See set_simulate_history_list_was_cleared() above.
   bool simulate_history_list_was_cleared_;
 
   // See SetContentsMimeType() above.
   std::string contents_mime_type_;
 
   // See opener_route_id() above.
   int opener_route_id_;
 
-  TestRenderFrameHost* main_render_frame_host_;
-
   DISALLOW_COPY_AND_ASSIGN(TestRenderViewHost);
 };
 
 #if defined(COMPILER_MSVC)
 #pragma warning(pop)
 #endif
 
 // Adds methods to get straight at the impl classes.
 class RenderViewHostImplTestHarness : public RenderViewHostTestHarness {
  public:
   RenderViewHostImplTestHarness();
   virtual ~RenderViewHostImplTestHarness();
 
   TestRenderViewHost* test_rvh();
   TestRenderViewHost* pending_test_rvh();
   TestRenderViewHost* active_test_rvh();
   TestRenderFrameHost* main_test_rfh();
   TestWebContents* contents();
 
  private:
   typedef scoped_ptr<ui::test::ScopedSetSupportedScaleFactors>
       ScopedSetSupportedScaleFactors;
   ScopedSetSupportedScaleFactors scoped_set_supported_scale_factors_;
   DISALLOW_COPY_AND_ASSIGN(RenderViewHostImplTestHarness);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_TEST_TEST_RENDER_VIEW_HOST_H_