Reloading page after installing app should bring it into correct process.

content/browser/tab_contents/navigation_controller_impl.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 "content/browser/tab_contents/navigation_controller_impl.h"
 
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/string_number_conversions.h"  // Temporary
 #include "base/string_util.h"
@@ skipping 247 matching lines @@
         content::NOTIFICATION_REPOST_WARNING_SHOWN,
         content::Source<NavigationController>(this),
         content::NotificationService::NoDetails());
 
     pending_reload_ = reload_type;
     tab_contents_->Activate();
     tab_contents_->GetDelegate()->ShowRepostFormWarningDialog(tab_contents_);
   } else {
     DiscardNonCommittedEntriesInternal();
 
-    pending_entry_index_ = current_index;
-    entries_[pending_entry_index_]->SetTransitionType(
-        content::PAGE_TRANSITION_RELOAD);
+    NavigationEntryImpl* entry = entries_[current_index].get();

[Charlie Reis, 2012/01/26 01:20:23]

GetEntryAtIndex

[nasko, 2012/01/26 20:25:57]

I've used direct access to the collection, since I get back a
NavigationEntryImpl*, whereas this call returns NavigationEntry*. Since site
instance is not publicly available through NavigationEntry*, I would need to
cast it. This version seems more intuitive to get the proper pointer type back.

[Charlie Reis, 2012/01/26 21:49:45]

Ah.  Yes, that's fine then.  I've emailed John about adding SiteInstance to the
public NavigationEntry interface, but that will be for a separate CL.

+    SiteInstance* site_instance = entry->site_instance();
+
+    // If we are reloading an entry that no longer belongs to the current
+    // site instance (for example, refreshing a page for just installed app),
+    // the reload must happen in a new process and behave as new navigation

[Charlie Reis, 2012/01/26 01:20:23]

Nit: let's split out the "behave as new navigation" into a separate sentence
that says a bit more.  It's important to note that we need a new entry with a
different SiteInstance and fresh page_id, so we treat it as a new navigation
(which happens to clear the forward history).

[nasko, 2012/01/26 20:25:57]

Done.

+    // when it comes to history.
+    if (site_instance != NULL &&

[Charlie Reis, 2012/01/26 01:20:23]

More common to drop the != NULL.  And actually, should we be asserting that it
isn't NULL?  If we're reloading an entry, I would never expect it to have a NULL
SiteInstance.

[nasko, 2012/01/26 20:25:57]

Done.

+        site_instance->HasWrongProcessForURL(entry->GetURL())) {
+      // Create a navigation entry that resembles the current one

[Charlie Reis, 2012/01/26 01:20:23]

Nit: perhaps mention which things must not be copied (page ID, SiteInstance, and
content_state), and end comments with a period.

[nasko, 2012/01/26 20:25:57]

Done.

+      NavigationEntryImpl* nav_entry = NavigationEntryImpl::FromNavigationEntry(
+          CreateNavigationEntry(
+              entry->GetURL(), entry->GetReferrer(), entry->GetTransitionType(),
+              false, entry->extra_headers(), browser_context_));
+
+      nav_entry->set_is_cross_site_reload(true);
+      pending_entry_ = nav_entry;
+    } else {
+      pending_entry_index_ = current_index;
+      entries_[pending_entry_index_]->SetTransitionType(
+          content::PAGE_TRANSITION_RELOAD);
+    }
+
     NavigateToPendingEntry(reload_type);
   }
 }
 
 void NavigationControllerImpl::CancelPendingReload() {
   DCHECK(pending_reload_ != NO_RELOAD);
   pending_reload_ = NO_RELOAD;
 }
 
 void NavigationControllerImpl::ContinuePendingReload() {
@@ skipping 294 matching lines @@
   } else {
     details->previous_url = GURL();
     details->previous_entry_index = -1;
   }
 
   // If we have a pending entry at this point, it should have a SiteInstance.
   // Restored entries start out with a null SiteInstance, but we should have
   // assigned one in NavigateToPendingEntry.
   DCHECK(pending_entry_index_ == -1 || pending_entry_->site_instance());
 
+  // If we are doing a cross-site reload, we need to replace the existing
+  // navigation entry, not add another entry to the history. This has the side
+  // effect of removing forward browsing history, if such existed.
+  if (pending_entry_ != NULL) {
+    details->did_replace_entry =  pending_entry_->is_cross_site_reload();

[Charlie Reis, 2012/01/26 01:20:23]

Nit: extra space.

+  }
+
   // is_in_page must be computed before the entry gets committed.
   details->is_in_page = IsURLInPageNavigation(params.url);
 
   // Do navigation-type specific actions. These will make and commit an entry.
   details->type = ClassifyNavigation(params);
 
   switch (details->type) {
     case content::NAVIGATION_TYPE_NEW_PAGE:
       RendererDidNavigateToNewPage(params, &(details->did_replace_entry));
       break;
@@ skipping 766 matching lines @@
   for (int i = 0; i < max_index; i++) {
     // When cloning a tab, copy all entries except interstitial pages
     if (source.entries_[i].get()->GetPageType() !=
         content::PAGE_TYPE_INTERSTITIAL) {
       entries_.insert(entries_.begin() + insert_index++,
                       linked_ptr<NavigationEntryImpl>(
                           new NavigationEntryImpl(*source.entries_[i])));
     }
   }
 }