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

content/common/frame_messages.h

Index: content/common/frame_messages.h
diff --git a/content/common/frame_messages.h b/content/common/frame_messages.h
index b145531936ede993e4c0c2f321aa1055988b5aff..69b56e32e237e153dfda8c160d7a7dda6c9c48f2 100644
--- a/content/common/frame_messages.h
+++ b/content/common/frame_messages.h
@@ -124,7 +124,6 @@
 
 IPC_STRUCT_TRAITS_BEGIN(content::FrameNavigateParams)
   IPC_STRUCT_TRAITS_MEMBER(page_id)
-  IPC_STRUCT_TRAITS_MEMBER(nav_entry_id)
   IPC_STRUCT_TRAITS_MEMBER(url)
   IPC_STRUCT_TRAITS_MEMBER(base_url)
   IPC_STRUCT_TRAITS_MEMBER(referrer)
@@ -143,15 +142,6 @@
                              content::FrameNavigateParams)
   IPC_STRUCT_TRAITS_PARENT(content::FrameNavigateParams)
 
-  // This is the value from the browser (copied from the navigation request)
-  // indicating whether it intended to make a new entry. 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.
-  IPC_STRUCT_MEMBER(bool, intended_as_new_entry)
-
-  // Whether this commit created a new entry.
-  IPC_STRUCT_MEMBER(bool, did_create_new_entry)
-
   // Information regarding the security of the connection (empty if the
   // connection was not secure).
   IPC_STRUCT_MEMBER(std::string, security_info)
@@ -283,8 +273,6 @@
   IPC_STRUCT_TRAITS_MEMBER(request_time)
   IPC_STRUCT_TRAITS_MEMBER(page_state)
   IPC_STRUCT_TRAITS_MEMBER(page_id)
-  IPC_STRUCT_TRAITS_MEMBER(nav_entry_id)
-  IPC_STRUCT_TRAITS_MEMBER(intended_as_new_entry)
   IPC_STRUCT_TRAITS_MEMBER(pending_history_list_offset)
   IPC_STRUCT_TRAITS_MEMBER(current_history_list_offset)
   IPC_STRUCT_TRAITS_MEMBER(current_history_list_length)