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 c7df11d36fa8b403ade443fcfea012aeda3a204b..197969af785ab37e3f71cb5a98e2a08eb2194a10 100644
--- a/content/browser/frame_host/navigation_controller_impl.h
+++ b/content/browser/frame_host/navigation_controller_impl.h
@@ -107,6 +107,9 @@ class CONTENT_EXPORT NavigationControllerImpl
   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(
@@ -230,6 +233,11 @@ class CONTENT_EXPORT NavigationControllerImpl
   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. http://crbug.com/369661

[Charlie Reis, 2015/03/12 18:28:17]

Mention that we currently only call it in debug builds.

[Avi (use Gerrit), 2015/03/12 19:21:17]

That depends on how we want to land this.

+  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.