Foreign session pages now load into current tab.

chrome/browser/sessions/session_restore.h

 // 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.
 
 #ifndef CHROME_BROWSER_SESSIONS_SESSION_RESTORE_H_
 #define CHROME_BROWSER_SESSIONS_SESSION_RESTORE_H_
 
 #include <vector>
 
 #include "base/basictypes.h"
@@ skipping 47 matching lines @@
   // the created Browsers.
   static std::vector<Browser*> RestoreForeignSessionWindows(
       Profile* profile,
       chrome::HostDesktopType host_desktop_type,
       std::vector<const SessionWindow*>::const_iterator begin,
       std::vector<const SessionWindow*>::const_iterator end);
 
   // Specifically used in the restoration of a foreign session.  This method
   // restores the given session tab to the browser of |source_web_contents| if
   // the disposition is not NEW_WINDOW. Returns the WebContents corresponding
-  // to the restored tab.
+  // to the restored tab. The Android implementation of this method takes

[sky, 2013/11/06 21:19:42]

I don't like having a different ownership model for android. That makes it very
easy to do the wrong thing. Can't we have the caller deal with Android
specifics?

[apiccion, 2013/11/06 21:37:03]

The interaction with source_web_contents depends on the disposition parameter.
When opened in the current-tab: web_contents gets swapped out with a new one
(the old one needs to be deleted). But when opened in a new tab, we still need
to keep the old content.

If the caller were responsible for cleanup, we'd still need to update this
comment to indicate under which conditions.

We could create a separate android header. However, I think the simplest
solution lets android callers to know they should never reference
source_web_contents after calling this method.

[sky, 2013/11/07 01:12:24]

Actually, the non-android implementation does the same. How about a comment of:
'If |disposition| is CURRENT_TAB, |source_web_contents| may be destroyed.'

I say may as this invokes CloseWebContentsAt(), which may not destroy. One more
question though. You're directly deleting the WebContents, what about unload
handlers? Are they not supported on android?

[apiccion, 2013/11/11 05:25:49]

Done. Regarding unload handlers: Please see Yaron's comment. (I believe they're
unsupported)

+  // ownership of |source_web_contents|.
   static content::WebContents* RestoreForeignSessionTab(
       content::WebContents* source_web_contents,
       const SessionTab& tab,
       WindowOpenDisposition disposition);
 
   // Returns true if we're in the process of restoring |profile|.
   static bool IsRestoring(const Profile* profile);
 
   // Returns true if synchronously restoring a session.
   static bool IsRestoringSynchronously();
 
   // The max number of non-selected tabs SessionRestore loads when restoring
   // a session. A value of 0 indicates all tabs are loaded at once.
   static size_t num_tabs_to_load_;
 
  private:
   SessionRestore();
 
   DISALLOW_COPY_AND_ASSIGN(SessionRestore);
 };
 
 #endif  // CHROME_BROWSER_SESSIONS_SESSION_RESTORE_H_