Foreign session pages now load into current tab.

chrome/browser/sessions/session_restore_android.cc

Index: chrome/browser/sessions/session_restore_android.cc
diff --git a/chrome/browser/sessions/session_restore_android.cc b/chrome/browser/sessions/session_restore_android.cc
index 9261700eff7049665b447ce0e03fcd0efcef1f71..887ba39a709e68b0e9256761adda9b7189d8c0dd 100644
--- a/chrome/browser/sessions/session_restore_android.cc
+++ b/chrome/browser/sessions/session_restore_android.cc
@@ -6,12 +6,13 @@
 
 #include <vector>
 
+#include "chrome/browser/android/tab_android.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sessions/session_types.h"
-#include "chrome/browser/ui/browser.h"
-#include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/android/tab_model/tab_model.h"
 #include "chrome/browser/ui/android/tab_model/tab_model_list.h"
+#include "chrome/browser/ui/browser.h"
+#include "chrome/browser/ui/browser_finder.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/web_contents.h"
 
@@ -37,7 +38,16 @@ content::WebContents* SessionRestore::RestoreForeignSessionTab(
       selected_index,
       content::NavigationController::RESTORE_LAST_SESSION_EXITED_CLEANLY,
       &entries);
-  tab_model->CreateTab(new_web_contents);
+
+  if (disposition == CURRENT_TAB) {
+    TabAndroid* current_tab = TabAndroid::FromWebContents(web_contents);
+    DCHECK(current_tab);
+    current_tab->SwapTabContents(web_contents, new_web_contents);
+    delete web_contents;

[newt (away), 2013/11/04 21:18:18]

I think this might be more complicated than just deleting the web_contents. In
prerender_manager.cc, there's a fair bit of logic to delete the old web
contents:

  if (old_web_contents->NeedToFireBeforeUnload()) {
    // Schedule the delete to occur after the tab has run its unload handlers.
    on_close_web_contents_deleters_.push_back(
        new OnCloseWebContentsDeleter(this, old_web_contents));
    old_web_contents->GetRenderViewHost()->
        FirePageBeforeUnload(false);
  } else {
    // No unload handler to run, so delete asap.
    ScheduleDeleteOldWebContents(old_web_contents, NULL);
  }

[Yaron, 2013/11/04 21:23:04]

Ya, I scanned that too. I didn't look very hard at it but I thought it was
specific to prerendering and fine to omit. Certainly one of the issues is
"before unload" handling which I thought is unsupported on Android. I think the
rest is scaffolding for prerendering but I might be mistaken.

+  } else {
+    DCHECK_EQ(disposition, NEW_FOREGROUND_TAB);
+    tab_model->CreateTab(new_web_contents);
+  }
   return new_web_contents;
 }