Classify navigations without page id in parallel to the existing classifier.

content/test/test_render_frame_host.h

 // Copyright 2013 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_FRAME_HOST_H_
 #define CONTENT_TEST_TEST_RENDER_FRAME_HOST_H_
 
 #include <vector>
 
 #include "base/basictypes.h"
@@ skipping 34 matching lines @@
                       int routing_id,
                       int flags);
   ~TestRenderFrameHost() override;
 
   // RenderFrameHostImpl overrides (same values, but in Test*/Mock* types)
   TestRenderViewHost* GetRenderViewHost() override;
   MockRenderProcessHost* GetProcess() override;
 
   // RenderFrameHostTester implementation.
   TestRenderFrameHost* AppendChild(const std::string& frame_name) override;
-  void SendNavigate(int page_id, const GURL& url) override;
-  void SendFailedNavigate(int page_id, const GURL& url) override;
+  void SendNavigate(int page_id,

[Charlie Reis, 2015/04/22 05:27:25]

I feel like we should give some guidance on what to pass for the new parameters
(e.g., pending entry's ID for browser-initiated navigations, 0 for
renderer-initiated navigations, etc).

Do you think there's a sensible place to do that here, or are the parameter
header files sufficient?

[Avi (use Gerrit), 2015/04/22 18:31:51]

My opinion, based on reading tests that use these functions, is that people only
have a vague idea of how this is supposed to work, and pretty much make up page
ids, etc. I'll write up header documentation, but I have zero faith that people
won't just end up copy/pasting from other tests and fiddling with it until it
works.

+                    int nav_entry_id,
+                    bool did_create_new_entry,
+                    const GURL& url) override;
+  void SendFailedNavigate(int page_id,
+                          int nav_entry_id,
+                          bool did_create_new_entry,
+                          const GURL& url) override;
   void SendNavigateWithTransition(int page_id,
+                                  int nav_entry_id,
+                                  bool did_create_new_entry,
                                   const GURL& url,
                                   ui::PageTransition transition) override;
   void SetContentsMimeType(const std::string& mime_type) override;
   void SendBeforeUnloadACK(bool proceed) override;
   void SimulateSwapOutACK() override;
 
-  void SendNavigateWithTransitionAndResponseCode(
-      int page_id,
-      const GURL& url, ui::PageTransition transition,
-      int response_code);
-  void SendNavigateWithOriginalRequestURL(
-      int page_id,
-      const GURL& url,
-      const GURL& original_request_url);
-  void SendNavigateWithFile(
-      int page_id,
-      const GURL& url,
-      const base::FilePath& file_path);
+  void SendNavigateWithTransitionAndResponseCode(int page_id,
+                                                 int nav_entry_id,
+                                                 bool did_create_new_entry,
+                                                 const GURL& url,
+                                                 ui::PageTransition transition,
+                                                 int response_code);
+  void SendNavigateWithOriginalRequestURL(int page_id,
+                                          int nav_entry_id,
+                                          bool did_create_new_entry,
+                                          const GURL& url,
+                                          const GURL& original_request_url);
+  void SendNavigateWithFile(int page_id,
+                            int nav_entry_id,
+                            bool did_create_new_entry,
+                            const GURL& url,
+                            const base::FilePath& file_path);
   void SendNavigateWithParams(
       FrameHostMsg_DidCommitProvisionalLoad_Params* params);
-  void SendNavigateWithRedirects(
-      int page_id,
-      const GURL& url,
-      const std::vector<GURL>& redirects);
+  void SendNavigateWithRedirects(int page_id,
+                                 int nav_entry_id,
+                                 bool did_create_new_entry,
+                                 const GURL& url,
+                                 const std::vector<GURL>& redirects);
   void SendNavigateWithParameters(
       int page_id,
+      int nav_entry_id,
+      bool did_create_new_entry,
       const GURL& url,
       ui::PageTransition transition,
       const GURL& original_request_url,
       int response_code,
       const base::FilePath* file_path_for_history_item,
       const std::vector<GURL>& redirects);
 
   // Simulate a renderer-initiated navigation up until commit.
-  void NavigateAndCommitRendererInitiated(int page_id, const GURL& url);
+  void NavigateAndCommitRendererInitiated(int page_id,
+                                          bool did_create_new_entry,
+                                          const GURL& url);
 
   // With the current navigation logic this method is a no-op.
   // PlzNavigate: this method simulates receiving a BeginNavigation IPC.
   void SendRendererInitiatedNavigationRequest(const GURL& url,
                                               bool has_user_gesture);
 
   void DidDisownOpener();
 
   // If set, navigations will appear to have cleared the history list in the
   // RenderFrame
@@ skipping 27 matching lines @@
 
   // See set_simulate_history_list_was_cleared() above.
   bool simulate_history_list_was_cleared_;
 
   DISALLOW_COPY_AND_ASSIGN(TestRenderFrameHost);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_TEST_TEST_RENDER_FRAME_HOST_H_