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

chrome/browser/android/foreign_session_helper.cc

 // 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.
 
 #include "chrome/browser/android/foreign_session_helper.h"
 
 #include <jni.h>
 
 #include "base/android/jni_string.h"
 #include "base/prefs/pref_service.h"
@@ skipping 32 matching lines @@
   if (!service || !service->ShouldPushChanges())
     return NULL;
 
   return service->GetOpenTabsUIDelegate();
 }
 
 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);
 
     if (current_navigation.virtual_url().is_empty())
       return true;
 
     return false;
 }
 
 bool ShouldSkipWindow(const SessionWindow& window) {
@@ skipping 20 matching lines @@
     JNIEnv* env,
     const SessionWindow& window,
     ScopedJavaLocalRef<jobject>& j_window) {
   for (std::vector<SessionTab*>::const_iterator tab_it = window.tabs.begin();
       tab_it != window.tabs.end(); ++tab_it) {
     const SessionTab &session_tab = **tab_it;
 
     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()));
 
     const ::sessions::SerializedNavigationEntry& current_navigation =
         session_tab.navigations.at(selected_index);
 
     GURL tab_url = current_navigation.virtual_url();
 
     Java_ForeignSessionHelper_pushTab(
         env, j_window.obj(),
@@ skipping 184 matching lines @@
                                                 jstring session_tag) {
   OpenTabsUIDelegate* open_tabs = GetOpenTabsUIDelegate(profile_);
   if (open_tabs)
     open_tabs->DeleteForeignSession(ConvertJavaStringToUTF8(env, session_tag));
 }
 
 // static
 bool ForeignSessionHelper::RegisterForeignSessionHelper(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }