Merge NOTIFICATION_RENDER_VIEW_HOST_CHANGED into NOTIFICATION_WEB_CONTENTS_SWAPPED.

apps/app_window_contents.cc

 // Copyright 2013 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 "apps/app_window_contents.h"
 
 #include "apps/native_app_window.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/extensions/api/app_window.h"
@@ skipping 42 matching lines @@
       creator_process_id) {
     SuspendRenderViewHost(web_contents_->GetRenderViewHost());
   } else {
     VLOG(1) << "ShellWindow created in new process ("
             << web_contents_->GetRenderViewHost()->GetProcess()->GetID()
             << ") != creator (" << creator_process_id
             << "). Routing disabled.";
   }
 
   // TODO(jeremya): there's a bug where navigating a web contents to an
-  // extension URL causes it to create a new RVH and discard the old
-  // (perfectly usable) one. To work around this, we watch for a RVH_CHANGED
-  // message from the web contents (which will be sent during LoadURL) and
-  // suspend resource requests on the new RVH to ensure that we block the new
-  // RVH from loading anything. It should be okay to remove the
-  // NOTIFICATION_RVH_CHANGED registration once http://crbug.com/123007 is
-  // fixed.
-  registrar_.Add(this, content::NOTIFICATION_RENDER_VIEW_HOST_CHANGED,
-                 content::Source<content::NavigationController>(
-                     &web_contents()->GetController()));
+  // extension URL causes it to create a new RVH and discard the old (perfectly
+  // usable) one. To work around this, we watch for a
+  // NOTIFICATION_WEB_CONTENTS_SWAPPED message from the web contents (which will
+  // be sent during LoadURL) and suspend resource requests on the new RVH to
+  // ensure that we block the new RVH from loading anything. It should be okay
+  // to remove the NOTIFICATION_WEB_CONTENTS_SWAPPED registration once
+  // http://crbug.com/123007 is fixed.
+  registrar_.Add(this, content::NOTIFICATION_WEB_CONTENTS_SWAPPED,
+                 content::Source<content::WebContents>(web_contents()));
   web_contents_->GetController().LoadURL(
       url_, content::Referrer(), content::PAGE_TRANSITION_LINK,
       std::string());
   registrar_.RemoveAll();
 }
 
 void AppWindowContents::NativeWindowChanged(
     NativeAppWindow* native_app_window) {
   base::ListValue args;
   DictionaryValue* dictionary = new DictionaryValue();
@@ skipping 27 matching lines @@
 
 content::WebContents* AppWindowContents::GetWebContents() const {
   return web_contents_.get();
 }
 
 void AppWindowContents::Observe(
     int type,
     const content::NotificationSource& source,
     const content::NotificationDetails& details) {
   switch (type) {
-    case content::NOTIFICATION_RENDER_VIEW_HOST_CHANGED: {
+    case content::NOTIFICATION_WEB_CONTENTS_SWAPPED: {
       // TODO(jeremya): once http://crbug.com/123007 is fixed, we'll no longer
       // need to suspend resource requests here (the call in the constructor
       // should be enough).
       content::Details<std::pair<content::RenderViewHost*,
                                  content::RenderViewHost*> >
           host_details(details);
       if (host_details->first)
         SuspendRenderViewHost(host_details->second);
       break;
     }
@@ skipping 37 matching lines @@
     content::RenderViewHost* rvh) {
   DCHECK(rvh);
   content::BrowserThread::PostTask(
       content::BrowserThread::IO, FROM_HERE,
       base::Bind(&content::ResourceDispatcherHost::BlockRequestsForRoute,
                  base::Unretained(content::ResourceDispatcherHost::Get()),
                  rvh->GetProcess()->GetID(), rvh->GetRoutingID()));
 }
 
 }  // namespace apps