Move browser-to-renderer opener plumbing to frame routing IDs

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 209 matching lines @@
   void TestOnUpdateStateWithFile(
       int page_id, const base::FilePath& file_path);
 
   void TestOnStartDragging(const DropData& drop_data);
 
   // If set, *delete_counter is incremented when this object destructs.
   void set_delete_counter(int* delete_counter) {
     delete_counter_ = delete_counter;
   }
 
-  // The opener route id passed to CreateRenderView().
-  int opener_route_id() const { return opener_route_id_; }
+  // The opener frame route id passed to CreateRenderView().
+  int opener_frame_route_id() const { return opener_frame_route_id_; }
 
   // RenderWidgetHost overrides (same value, but in the Mock* type)
   MockRenderProcessHost* GetProcess() const override;
 
   bool CreateTestRenderView(const base::string16& frame_name,
-                            int opener_route_id,
+                            int opener_frame_route_id,
                             int proxy_route_id,
                             int32 max_page_id,
                             bool window_was_created_with_opener) override;
 
   // RenderViewHost overrides --------------------------------------------------
 
-  bool CreateRenderView(int opener_route_id,
+  bool CreateRenderView(int opener_frame_route_id,
                         int proxy_route_id,
                         int32 max_page_id,
                         const FrameReplicationState& replicated_frame_state,
                         bool window_was_created_with_opener) override;
   bool IsFullscreenGranted() const override;
 
  private:
   FRIEND_TEST_ALL_PREFIXES(RenderViewHostTest, FilterNavigate);
 
   void SendNavigateWithTransitionAndResponseCode(int page_id,
                                                  const GURL& url,
                                                  ui::PageTransition transition,
                                                  int response_code);
 
   // Calls OnNavigate on the RenderViewHost with the given information.
   // Sets the rest of the parameters in the message to the "typical" values.
   // This is a helper function for simulating the most common types of loads.
   void SendNavigateWithParameters(
       int page_id,
       const GURL& url,
       ui::PageTransition transition,
       const GURL& original_request_url,
       int response_code,
       const base::FilePath* file_path_for_history_item);
 
   // See set_delete_counter() above. May be NULL.
   int* delete_counter_;
 
-  // See opener_route_id() above.
-  int opener_route_id_;
+  // See opener_frame_route_id() above.
+  int opener_frame_route_id_;
 
   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 {
@@ skipping 37 matching lines @@
  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_