Fix foreign tabs with > 6 navigations not showing up on Android, take 2.

chrome/browser/android/foreign_session_helper.cc

Index: chrome/browser/android/foreign_session_helper.cc
diff --git a/chrome/browser/android/foreign_session_helper.cc b/chrome/browser/android/foreign_session_helper.cc
index f1b35656673af4d3bef953110ac605f67e658dce..57f3405f12a5f8950b446db4dd9f11cd10f410ed 100644
--- a/chrome/browser/android/foreign_session_helper.cc
+++ b/chrome/browser/android/foreign_session_helper.cc
@@ -50,11 +50,7 @@ bool ShouldSkipTab(const SessionTab& session_tab) {
     if (session_tab.navigations.empty())
       return true;
 
-    int selected_index = session_tab.current_navigation_index;
-    if (selected_index < 0 ||
-        selected_index >= static_cast<int>(session_tab.navigations.size()))
-      return true;
-
+    int selected_index = session_tab.normalized_navigation_index();
     const ::sessions::SerializedNavigationEntry& current_navigation =
         session_tab.navigations.at(selected_index);
 
@@ -95,7 +91,7 @@ void CopyTabsToJava(
     if (ShouldSkipTab(session_tab))
       continue;
 
-    int selected_index = session_tab.current_navigation_index;
+    int selected_index = session_tab.normalized_navigation_index();
     DCHECK(selected_index >= 0);
     DCHECK(selected_index < static_cast<int>(session_tab.navigations.size()));