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

content/public/test/test_renderer_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_PUBLIC_TEST_TEST_RENDERER_HOST_H_
 #define CONTENT_PUBLIC_TEST_TEST_RENDERER_HOST_H_
 
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "content/public/browser/render_frame_host.h"
@@ skipping 53 matching lines @@
   // constructed while a RenderViewHostTestEnabler is in play.
   static bool IsRenderFrameHostSwappedOut(RenderFrameHost* rfh);
 
   virtual ~RenderFrameHostTester() {}
 
   // Gives tests access to RenderFrameHostImpl::OnCreateChild. The returned
   // RenderFrameHost is owned by the parent RenderFrameHost.
   virtual RenderFrameHost* AppendChild(const std::string& frame_name) = 0;
 
   // Calls OnDidCommitProvisionalLoad on the RenderFrameHost with the given
-  // information with various sets of parameters. These are helper functions for
-  // simulating the most common types of loads.
-  //
-  // Guidance for calling these:
-  // - nav_entry_id should be 0 if simulating a renderer-initiated navigation;
-  //   if simulating a browser-initiated one, pass the GetUniqueID() value of
-  //   the NavigationController's PendingEntry.
-  // - did_create_new_entry should be true if simulating a navigation that
-  //   created a new navigation entry; false for history navigations, reloads,
-  //   and other navigations that don't affect the history list.
-  virtual void SendNavigate(int page_id,
-                            int nav_entry_id,
-                            bool did_create_new_entry,
-                            const GURL& url) = 0;
-  virtual void SendFailedNavigate(int page_id,
-                                  int nav_entry_id,
-                                  bool did_create_new_entry,
-                                  const GURL& url) = 0;
+  // 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.
+  virtual void SendNavigate(int page_id, const GURL& url) = 0;
+  virtual void SendFailedNavigate(int page_id, const GURL& url) = 0;
+
+  // Calls OnDidCommitProvisionalLoad on the RenderFrameHost with the given
+  // information, including a custom PageTransition.  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.
   virtual void SendNavigateWithTransition(int page_id,
-                                          int nav_entry_id,
-                                          bool did_create_new_entry,
                                           const GURL& url,
                                           ui::PageTransition transition) = 0;
 
   // If set, future loads will have |mime_type| set as the mime type.
   // If not set, the mime type will default to "text/html".
   virtual void SetContentsMimeType(const std::string& mime_type) = 0;
 
   // Calls OnBeforeUnloadACK on this RenderFrameHost with the given parameter.
   virtual void SendBeforeUnloadACK(bool proceed) = 0;
 
@@ skipping 151 matching lines @@
   scoped_ptr<aura::test::AuraTestHelper> aura_test_helper_;
 #endif
   RenderViewHostTestEnabler rvh_test_enabler_;
 
   DISALLOW_COPY_AND_ASSIGN(RenderViewHostTestHarness);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_PUBLIC_TEST_TEST_RENDERER_HOST_H_