Foreign session pages now load into current tab.

chrome/browser/sessions/session_restore_android.cc

 // Copyright (c) 2012 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/sessions/session_restore.h"
 
 #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/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 "chrome/browser/ui/android/tab_model/tab_model.h"
-#include "chrome/browser/ui/android/tab_model/tab_model_list.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/web_contents.h"
 
 // The android implementation does not do anything "foreign session" specific.
 // We use it to restore tabs from "recently closed" too.
 // static
 content::WebContents* SessionRestore::RestoreForeignSessionTab(
     content::WebContents* web_contents,
     const SessionTab& session_tab,
     WindowOpenDisposition disposition) {
   DCHECK(session_tab.navigations.size() > 0);
   content::BrowserContext* context = web_contents->GetBrowserContext();
   Profile* profile = Profile::FromBrowserContext(context);
   TabModel* tab_model = TabModelList::GetTabModelWithProfile(profile);
   DCHECK(tab_model);
   std::vector<content::NavigationEntry*> entries =
       sessions::SerializedNavigationEntry::ToNavigationEntries(
           session_tab.navigations, profile);
   content::WebContents* new_web_contents = content::WebContents::Create(
       content::WebContents::CreateParams(context));
   int selected_index = session_tab.normalized_navigation_index();
   new_web_contents->GetController().Restore(
       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);

[Yaron, 2013/11/04 18:48:37]

looks like you're leaking the old web_contents. From the comments of
CoreTabHelperDelegate you need to take care of ownership.

[apiccion, 2013/11/04 19:43:52]

Deleted the object here. Added a comment in .h file explaining Android
ownership.

+  } else {
+    DCHECK(disposition == NEW_FOREGROUND_TAB);

[Yaron, 2013/11/04 18:48:37]

DCHECK_EQ

[apiccion, 2013/11/04 19:43:52]

Done.

+    tab_model->CreateTab(new_web_contents);
+  }
   return new_web_contents;
 }
 
 // static
 std::vector<Browser*> SessionRestore::RestoreForeignSessionWindows(
     Profile* profile,
     chrome::HostDesktopType host_desktop_type,
     std::vector<const SessionWindow*>::const_iterator begin,
     std::vector<const SessionWindow*>::const_iterator end) {
   NOTREACHED();
   return std::vector<Browser*>();
 }