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

content/browser/frame_host/navigation_controller_impl.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_BROWSER_FRAME_HOST_NAVIGATION_CONTROLLER_IMPL_H_
 #define CONTENT_BROWSER_FRAME_HOST_NAVIGATION_CONTROLLER_IMPL_H_
 
 #include "base/callback.h"
 #include "base/compiler_specific.h"
 #include "base/gtest_prod_util.h"
@@ skipping 89 matching lines @@
 
   // Returns the index of the specified entry, or -1 if entry is not contained
   // in this NavigationController.
   int GetIndexOfEntry(const NavigationEntryImpl* entry) const;
 
   // Return the index of the entry with the corresponding instance and page_id,
   // or -1 if not found.
   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(
       SiteInstance* instance,
       int32 page_id) const;
 
   NavigationControllerDelegate* delegate() const {
     return delegate_;
   }
 
@@ skipping 104 matching lines @@
     // |low_water_mark_| is the first time in a sequence of adjusted
     // times and |high_water_mark_| is the last.
     base::Time low_water_mark_;
     base::Time high_water_mark_;
   };
 
   // Classifies the given renderer navigation (see the NavigationType enum).
   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.
   // NOTE: Do not pass an entry that the controller already owns!
   void LoadEntry(NavigationEntryImpl* entry);
 
   // Handlers for the different types of navigation types. They will actually
   // handle the navigations corresponding to the different NavClasses above.
   // They will NOT broadcast the commit notification, that should be handled by
   // the caller.
@@ skipping 177 matching lines @@
   TimeSmoother time_smoother_;
 
   scoped_ptr<NavigationEntryScreenshotManager> screenshot_manager_;
 
   DISALLOW_COPY_AND_ASSIGN(NavigationControllerImpl);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_FRAME_HOST_NAVIGATION_CONTROLLER_IMPL_H_