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

content/browser/frame_host/navigation_controller_impl.h

Index: content/browser/frame_host/navigation_controller_impl.h
diff --git a/content/browser/frame_host/navigation_controller_impl.h b/content/browser/frame_host/navigation_controller_impl.h
index 8546940148ef36f7d34c82bc1676238dd7370f80..da3bbd3c4e8831ac239d6a4cc6fb38d2c3a6e7da 100644
--- a/content/browser/frame_host/navigation_controller_impl.h
+++ b/content/browser/frame_host/navigation_controller_impl.h
@@ -107,9 +107,6 @@
   int GetEntryIndexWithPageID(SiteInstance* instance,
                               int32 page_id) const;
 
-  // Return the index of the entry with the given unique id, or -1 if not found.
-  int GetEntryIndexWithUniqueID(int nav_entry_id) const;
-
   // Return the entry with the corresponding instance and page_id, or NULL if
   // not found.
   NavigationEntryImpl* GetEntryWithPageID(
@@ -234,12 +231,6 @@
   NavigationType ClassifyNavigation(
       RenderFrameHostImpl* rfh,
       const FrameHostMsg_DidCommitProvisionalLoad_Params& params) const;
-  // This does the same as above (hopefully), but does so without any use of
-  // deprecated page id values. Once it bakes and is verified to behave the
-  // same, it will replace it. http://crbug.com/369661
-  NavigationType ClassifyNavigationWithoutPageID(
-      RenderFrameHostImpl* rfh,
-      const FrameHostMsg_DidCommitProvisionalLoad_Params& params) const;
 
   // Causes the controller to load the specified entry. The function assumes
   // ownership of the pointer since it is put in the navigation list.