Merge 110556 - Fix next_page_id_ in a NTP forced to share an existing WebUI process.

content/browser/site_instance.cc

 // Copyright (c) 2011 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/site_instance.h"
 
 #include "content/browser/browsing_instance.h"
 #include "content/browser/content_browser_client.h"
 #include "content/browser/renderer_host/browser_render_process_host.h"
 #include "content/browser/webui/web_ui_factory.h"
@@ skipping 67 matching lines @@
     if (!process_) {
       if (render_process_host_factory_) {
         process_ = render_process_host_factory_->CreateRenderProcessHost(
             browsing_instance_->browser_context());
       } else {
         process_ =
             new BrowserRenderProcessHost(browsing_instance_->browser_context());
       }
     }
 
-    // Make sure the process starts at the right max_page_id
-    process_->UpdateMaxPageID(max_page_id_);
+    // Make sure the process starts at the right max_page_id, and ensure that
+    // we send an update to the renderer process.
+    process_->UpdateAndSendMaxPageID(max_page_id_);
   }
   DCHECK(process_);
 
   return process_;
 }
 
 void SiteInstance::SetSite(const GURL& url) {
   // A SiteInstance's site should not change.
   // TODO(creis): When following links or script navigations, we can currently
   // render pages from other sites in this SiteInstance.  This will eventually
@@ skipping 122 matching lines @@
 }
 
 void SiteInstance::Observe(int type,
                            const NotificationSource& source,
                            const NotificationDetails& details) {
   DCHECK(type == content::NOTIFICATION_RENDERER_PROCESS_TERMINATED);
   RenderProcessHost* rph = Source<RenderProcessHost>(source).ptr();
   if (rph == process_)
     process_ = NULL;
 }