Merge NOTIFICATION_RENDER_VIEW_HOST_CHANGED into NOTIFICATION_WEB_CONTENTS_SWAPPED.

chrome/browser/extensions/extension_process_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 "chrome/browser/extensions/extension_process_manager.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/lazy_instance.h"
 #include "base/logging.h"
@@ skipping 323 matching lines @@
   for (ExtensionRenderViews::iterator view = all_extension_views_.begin();
        view != all_extension_views_.end(); ++view) {
     if (view->first->GetSiteInstance() == site_instance)
       result.insert(view->first);
   }
 
   return result;
 }
 
 const Extension* ExtensionProcessManager::GetExtensionForRenderViewHost(
-    content::RenderViewHost* render_view_host) {
+    RenderViewHost* render_view_host) {
   if (!render_view_host->GetSiteInstance())
     return NULL;
 
   ExtensionService* service =
       extensions::ExtensionSystem::Get(GetProfile())->extension_service();
   if (!service)
     return NULL;
 
   return service->extensions()->GetByID(GetExtensionID(render_view_host));
 }
@@ skipping 274 matching lines @@
       }
       break;
     }
 
     case content::NOTIFICATION_WEB_CONTENTS_SWAPPED: {
       // We get this notification both for new WebContents and when one
       // has its RenderViewHost replaced (e.g. when a user does a cross-site
       // navigation away from an extension URL). For the replaced case, we must
       // unregister the old RVH so it doesn't count as an active view that would
       // keep the event page alive.
-      content::WebContents* contents =
-          content::Source<content::WebContents>(source).ptr();
+      WebContents* contents = content::Source<WebContents>(source).ptr();
       if (contents->GetBrowserContext() != GetProfile())
         break;
 
-      content::RenderViewHost* old_render_view_host =
-          content::Details<content::RenderViewHost>(details).ptr();
-      if (old_render_view_host)
-        UnregisterRenderViewHost(old_render_view_host);
-      RegisterRenderViewHost(contents->GetRenderViewHost());
+      typedef std::pair<RenderViewHost*, RenderViewHost*> RVHPair;
+      RVHPair* switched_details = content::Details<RVHPair>(details).ptr();
+      if (switched_details->first)
+        UnregisterRenderViewHost(switched_details->first);
+      RegisterRenderViewHost(switched_details->second);
       break;
     }
 
     case content::NOTIFICATION_WEB_CONTENTS_CONNECTED: {
-      content::WebContents* contents =
-          content::Source<content::WebContents>(source).ptr();
+      WebContents* contents = content::Source<WebContents>(source).ptr();
       if (contents->GetBrowserContext() != GetProfile())
         break;
       const Extension* extension = GetExtensionForRenderViewHost(
           contents->GetRenderViewHost());
       if (!extension)
         return;
 
       // RegisterRenderViewHost is called too early (before the process is
       // available), so we need to wait until now to notify.
       content::NotificationService::current()->Notify(
@@ skipping 11 matching lines @@
       break;
     }
 
     default:
       NOTREACHED();
   }
 }
 
 void ExtensionProcessManager::OnDevToolsStateChanged(
     content::DevToolsAgentHost* agent_host, bool attached) {
-  content::RenderViewHost* rvh = agent_host->GetRenderViewHost();
+  RenderViewHost* rvh = agent_host->GetRenderViewHost();
   // Ignore unrelated notifications.
   if (!rvh ||
       rvh->GetSiteInstance()->GetProcess()->GetBrowserContext() != GetProfile())
     return;
   if (extensions::GetViewType(WebContents::FromRenderViewHost(rvh)) !=
       extensions::VIEW_TYPE_EXTENSION_BACKGROUND_PAGE)
     return;
   const Extension* extension = GetExtensionForRenderViewHost(rvh);
   if (!extension)
     return;
@@ skipping 212 matching lines @@
         if (service && service->is_ready())
           CreateBackgroundHostsForProfileStartup();
       }
       break;
     }
     default:
       ExtensionProcessManager::Observe(type, source, details);
       break;
   }
 }