Merge NOTIFICATION_RENDER_VIEW_HOST_CHANGED into NOTIFICATION_WEB_CONTENTS_SWAPPED.

content/browser/web_contents/render_view_host_manager.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/web_contents/render_view_host_manager.h"
 
 #include <utility>
 
 #include "base/command_line.h"
 #include "base/debug/trace_event.h"
@@ skipping 147 matching lines @@
 
     // Now that we've created a new renderer, be sure to hide it if it isn't
     // our primary one.  Otherwise, we might crash if we try to call Show()
     // on it later.
     if (dest_render_view_host != render_view_host_ &&
         dest_render_view_host->GetView()) {
       dest_render_view_host->GetView()->Hide();
     } else {
       // This is our primary renderer, notify here as we won't be calling
       // CommitPending (which does the notify).
-      RenderViewHost* null_rvh = NULL;
-      std::pair<RenderViewHost*, RenderViewHost*> details =
-          std::make_pair(null_rvh, render_view_host_);
-      NotificationService::current()->Notify(
-          NOTIFICATION_RENDER_VIEW_HOST_CHANGED,
-          Source<NavigationController>(
-              &delegate_->GetControllerForRenderManager()),
-          Details<std::pair<RenderViewHost*, RenderViewHost*> >(
-              &details));
+      delegate_->NotifySwappedFromRenderManager(NULL, render_view_host_);
     }
   }
 
   return dest_render_view_host;
 }
 
 void RenderViewHostManager::Stop() {
   render_view_host_->Stop();
 
   // If we are cross-navigating, we should stop the pending renderers.  This
@@ skipping 584 matching lines @@
   }
 
   // Make sure the size is up to date.  (Fix for bug 1079768.)
   delegate_->UpdateRenderViewSizeForRenderManager();
 
   if (will_focus_location_bar)
     delegate_->SetFocusToLocationBar(false);
   else if (focus_render_view && render_view_host_->GetView())
     RenderWidgetHostViewPort::FromRWHV(render_view_host_->GetView())->Focus();
 
-  std::pair<RenderViewHost*, RenderViewHost*> details =
-      std::make_pair(old_render_view_host, render_view_host_);
-  NotificationService::current()->Notify(
-      NOTIFICATION_RENDER_VIEW_HOST_CHANGED,
-      Source<NavigationController>(
-          &delegate_->GetControllerForRenderManager()),
-      Details<std::pair<RenderViewHost*, RenderViewHost*> >(&details));
+  // Notify that we've swapped RenderViewHosts. We do this
+  // before shutting down the RVH so that we can clean up
+  // RendererResources related to the RVH first.
+  delegate_->NotifySwappedFromRenderManager(old_render_view_host,
+                                            render_view_host_);
 
   // If the pending view was on the swapped out list, we can remove it.
   swapped_out_hosts_.erase(render_view_host_->GetSiteInstance()->GetId());
 
-  // Let the task manager know that we've swapped RenderViewHosts,
-  // since it might need to update its process groupings. We do this
-  // before shutting down the RVH so that we can clean up
-  // RendererResources related to the RVH first.
-  delegate_->NotifySwappedFromRenderManager(old_render_view_host);
-
   // If there are no active RVHs in this SiteInstance, it means that
   // this RVH was the last active one in the SiteInstance. Now that we
   // know that all RVHs are swapped out, we can delete all the RVHs in
   // this SiteInstance.
   if (!static_cast<SiteInstanceImpl*>(old_render_view_host->GetSiteInstance())->
           active_view_count()) {
     ShutdownRenderViewHostsInSiteInstance(
         old_render_view_host->GetSiteInstance()->GetId());
     // This is deleted while cleaning up the SitaInstance's views.
     old_render_view_host = NULL;
@@ skipping 248 matching lines @@
 RenderViewHostImpl* RenderViewHostManager::GetSwappedOutRenderViewHost(
     SiteInstance* instance) {
   RenderViewHostMap::iterator iter = swapped_out_hosts_.find(instance->GetId());
   if (iter != swapped_out_hosts_.end())
     return iter->second;
 
   return NULL;
 }
 
 }  // namespace content