content: Remove usage of NOTIFICATION_WEB_CONTENTS_DESTROYED from content

content/browser/web_contents/interstitial_page_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/web_contents/interstitial_page_impl.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/compiler_specific.h"
@@ skipping 117 matching lines @@
   if (iter == g_web_contents_to_interstitial_page->end())
     return NULL;
 
   return iter->second;
 }
 
 InterstitialPageImpl::InterstitialPageImpl(WebContents* web_contents,
                                            bool new_navigation,
                                            const GURL& url,
                                            InterstitialPageDelegate* delegate)
-    : web_contents_(static_cast<WebContentsImpl*>(web_contents)),
+    : WebContentsObserver(web_contents),
+      web_contents_(static_cast<WebContentsImpl*>(web_contents)),
       url_(url),
       new_navigation_(new_navigation),
       should_discard_pending_nav_entry_(new_navigation),
       reload_on_dont_proceed_(false),
       enabled_(true),
       action_taken_(NO_ACTION),
       render_view_host_(NULL),
       original_child_id_(web_contents->GetRenderProcessHost()->GetID()),
       original_rvh_id_(web_contents->GetRenderViewHost()->GetRoutingID()),
       should_revert_web_contents_title_(false),
@@ skipping 68 matching lines @@
   }
 
   DCHECK(!render_view_host_);
   render_view_host_ = static_cast<RenderViewHostImpl*>(CreateRenderViewHost());
   CreateWebContentsView();
 
   std::string data_url = "data:text/html;charset=utf-8," +
                          net::EscapePath(delegate_->GetHTMLContents());
   render_view_host_->NavigateToURL(GURL(data_url));
 
-  notification_registrar_.Add(this,
-                              NOTIFICATION_WEB_CONTENTS_DESTROYED,
-                              Source<WebContents>(web_contents_));
   notification_registrar_.Add(this, NOTIFICATION_NAV_ENTRY_COMMITTED,
       Source<NavigationController>(&web_contents_->GetController()));
   notification_registrar_.Add(this, NOTIFICATION_NAV_ENTRY_PENDING,
       Source<NavigationController>(&web_contents_->GetController()));
   notification_registrar_.Add(
       this, NOTIFICATION_DOM_OPERATION_RESPONSE,
       Source<RenderViewHost>(render_view_host_));
 }
 
 void InterstitialPageImpl::Hide() {
@@ skipping 77 matching lines @@
         // closed); make sure we clear the blocked requests.
         RenderViewHost* rvh = static_cast<RenderViewHost*>(
             static_cast<RenderViewHostImpl*>(
                 RenderWidgetHostImpl::From(
                     Source<RenderWidgetHost>(source).ptr())));
         DCHECK(rvh->GetProcess()->GetID() == original_child_id_ &&
                rvh->GetRoutingID() == original_rvh_id_);
         TakeActionOnResourceDispatcher(CANCEL);
       }
       break;
-    case NOTIFICATION_WEB_CONTENTS_DESTROYED:
     case NOTIFICATION_NAV_ENTRY_COMMITTED:
-      if (action_taken_ == NO_ACTION) {
-        // We are navigating away from the interstitial or closing a tab with an
-        // interstitial.  Default to DontProceed(). We don't just call Hide as
-        // subclasses will almost certainly override DontProceed to do some work
-        // (ex: close pending connections).
-        DontProceed();
-      } else {
-        // User decided to proceed and either the navigation was committed or
-        // the tab was closed before that.
-        Hide();
-      }
+      OnNavigatingAwayOrTabClosing();
       break;
     case NOTIFICATION_DOM_OPERATION_RESPONSE:
       if (enabled()) {
         Details<DomOperationNotificationDetails> dom_op_details(
             details);
         delegate_->CommandReceived(dom_op_details->json);
       }
       break;
     default:
       NOTREACHED();
   }
 }
 
+void InterstitialPageImpl::WebContentsDestroyed(WebContents* web_contents) {
+  OnNavigatingAwayOrTabClosing();
+}
+
 RenderViewHostDelegateView* InterstitialPageImpl::GetDelegateView() {
   return rvh_delegate_view_.get();
 }
 
 const GURL& InterstitialPageImpl::GetURL() const {
   return url_;
 }
 
 void InterstitialPageImpl::RenderViewTerminated(
     RenderViewHost* render_view_host,
@@ skipping 351 matching lines @@
 
 void InterstitialPageImpl::Disable() {
   enabled_ = false;
 }
 
 void InterstitialPageImpl::Shutdown(RenderViewHostImpl* render_view_host) {
   render_view_host->Shutdown();
   // We are deleted now.
 }
 
+void InterstitialPageImpl::OnNavigatingAwayOrTabClosing() {
+  if (action_taken_ == NO_ACTION) {
+    // We are navigating away from the interstitial or closing a tab with an
+    // interstitial.  Default to DontProceed(). We don't just call Hide as
+    // subclasses will almost certainly override DontProceed to do some work
+    // (ex: close pending connections).
+    DontProceed();
+  } else {
+    // User decided to proceed and either the navigation was committed or
+    // the tab was closed before that.
+    Hide();
+  }
+}
+
 void InterstitialPageImpl::TakeActionOnResourceDispatcher(
     ResourceRequestAction action) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)) <<
       "TakeActionOnResourceDispatcher should be called on the main thread.";
 
   if (action == CANCEL || action == RESUME) {
     if (resource_dispatcher_host_notified_)
       return;
     resource_dispatcher_host_notified_ = true;
   }
@@ skipping 66 matching lines @@
 
   web_contents->GetDelegateView()->TakeFocus(reverse);
 }
 
 void InterstitialPageImpl::InterstitialPageRVHDelegateView::OnFindReply(
     int request_id, int number_of_matches, const gfx::Rect& selection_rect,
     int active_match_ordinal, bool final_update) {
 }
 
 }  // namespace content