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

content/common/navigation_params.h

 // Copyright 2014 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_COMMON_NAVIGATION_PARAMS_H_
 #define CONTENT_COMMON_NAVIGATION_PARAMS_H_
 
 #include <string>
 
 #include "base/basictypes.h"
@@ skipping 151 matching lines @@
 // navigation that is ready to commit.
 struct CONTENT_EXPORT RequestNavigationParams {
   RequestNavigationParams();
   RequestNavigationParams(bool is_overriding_user_agent,
                           base::TimeTicks navigation_start,
                           const std::vector<GURL>& redirects,
                           bool can_load_local_resources,
                           base::Time request_time,
                           const PageState& page_state,
                           int32 page_id,
-                          int nav_entry_id,
-                          bool intended_as_new_entry,
                           int pending_history_list_offset,
                           int current_history_list_offset,
                           int current_history_list_length,
                           bool should_clear_history_list);
   ~RequestNavigationParams();
 
   // Whether or not the user agent override string should be used.
   bool is_overriding_user_agent;
 
   // The navigationStart time to expose through the Navigation Timing API to JS.
@@ skipping 14 matching lines @@
 
   // Opaque history state (received by ViewHostMsg_UpdateState).
   PageState page_state;
 
   // The page_id for this navigation, or -1 if it is a new navigation.  Back,
   // Forward, and Reload navigations should have a valid page_id.  If the load
   // succeeds, then this page_id will be reflected in the resultant
   // FrameHostMsg_DidCommitProvisionalLoad message.
   int32 page_id;
 
-  // For browser-initiated navigations, this is the unique id of the
-  // NavigationEntry being navigated to. (For renderer-initiated navigations it
-  // is 0.) If the load succeeds, then this nav_entry_id will be reflected in
-  // the resulting FrameHostMsg_DidCommitProvisionalLoad message.
-  int nav_entry_id;
-
-  // For browser-initiated navigations, this is true if this is a new entry
-  // being navigated to. This is false otherwise. TODO(avi): Remove this when
-  // the pending entry situation is made sane and the browser keeps them around
-  // long enough to match them via nav_entry_id, above.
-  bool intended_as_new_entry;
-
   // For history navigations, this is the offset in the history list of the
   // pending load. For non-history navigations, this will be ignored.
   int pending_history_list_offset;
 
   // Where its current page contents reside in session history and the total
   // size of the session history list.
   int current_history_list_offset;
   int current_history_list_length;
 
   // Whether session history should be cleared. In that case, the RenderView
@@ skipping 11 matching lines @@
   ~NavigationParams();
 
   CommonNavigationParams common_params;
   StartNavigationParams start_params;
   RequestNavigationParams request_params;
 };
 
 }  // namespace content
 
 #endif  // CONTENT_COMMON_NAVIGATION_PARAMS_H_