Support window.opener after a process swap.

Changes:
1. Swap out RVHs instead of closing them, so we can return to the same Frame object if we later come back.
2. Filter out messages from swapped out RVHs, in case any are in-flight.
3. Remove the workaround for navigating away from an app.
4. Update tests to reflect the new sequence of events.

BUG=65953
TEST=AppApiTest.AppProcess
TEST=ResourceDispatcherTest.CrossSiteImmediateLoadOnunloadCookie

Review URL: http://codereview.chromium.org/6319001

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@85134 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 9 insertions, 0 deletions

diff --git a/content/browser/site_instance.h b/content/browser/site_instance.h
index 76f966e..3b6346d 100644
--- a/content/browser/site_instance.h
+++ b/content/browser/site_instance.h
@@ -50,6 +50,9 @@ class BrowsingInstance;
 class SiteInstance : public base::RefCounted<SiteInstance>,
                      public NotificationObserver {
  public:
+  // Returns a unique ID for this SiteInstance.
+  int32 id() { return id_; }
+
   // Get the BrowsingInstance to which this SiteInstance belongs.
   BrowsingInstance* browsing_instance() { return browsing_instance_; }
 
@@ -162,6 +165,12 @@ class SiteInstance : public base::RefCounted<SiteInstance>,
                        const NotificationSource& source,
                        const NotificationDetails& details);
 
+  // The next available SiteInstance ID.
+  static int32 next_site_instance_id_;
+
+  // A unique ID for this SiteInstance.
+  int32 id_;
+
   NotificationRegistrar registrar_;
 
   // BrowsingInstance to which this SiteInstance belongs.