Move notifications used only in chrome/ out of content/.

chrome/browser/download/download_request_limiter.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/download/download_request_limiter.h"
 
 #include "base/bind.h"
 #include "base/stl_util.h"
 #include "chrome/browser/download/download_request_infobar_delegate.h"
 #include "chrome/browser/infobars/infobar_tab_helper.h"
@@ skipping 19 matching lines @@
 DownloadRequestLimiter::TabDownloadState::TabDownloadState(
     DownloadRequestLimiter* host,
     NavigationController* controller,
     NavigationController* originating_controller)
     : host_(host),
       controller_(controller),
       status_(DownloadRequestLimiter::ALLOW_ONE_DOWNLOAD),
       download_count_(0),
       infobar_(NULL) {
   content::Source<NavigationController> notification_source(controller);
+  content::Source<content::WebContents> web_contents_source(
+       controller->GetWebContents());
   registrar_.Add(this, content::NOTIFICATION_NAV_ENTRY_PENDING,
                  notification_source);
-  registrar_.Add(this, content::NOTIFICATION_TAB_CLOSED, notification_source);
+  registrar_.Add(this, content::NOTIFICATION_WEB_CONTENTS_DESTROYED,
+                 web_contents_source);
 
   NavigationEntry* active_entry = originating_controller ?
       originating_controller->GetActiveEntry() : controller->GetActiveEntry();
   if (active_entry)
     initial_page_host_ = active_entry->GetURL().host();
 }
 
 DownloadRequestLimiter::TabDownloadState::~TabDownloadState() {
   // We should only be destroyed after the callbacks have been notified.
   DCHECK(callbacks_.empty());
@@ skipping 41 matching lines @@
 }
 
 void DownloadRequestLimiter::TabDownloadState::Accept() {
   NotifyCallbacks(true);
 }
 
 void DownloadRequestLimiter::TabDownloadState::Observe(
     int type,
     const content::NotificationSource& source,
     const content::NotificationDetails& details) {
-  if ((type != content::NOTIFICATION_NAV_ENTRY_PENDING &&
-       type != content::NOTIFICATION_TAB_CLOSED) ||
+  if (type != content::NOTIFICATION_NAV_ENTRY_PENDING &&
+      type != content::NOTIFICATION_WEB_CONTENTS_DESTROYED) {
+    NOTREACHED();
+    return;
+  }
+  if (type == content::NOTIFICATION_NAV_ENTRY_PENDING &&
       content::Source<NavigationController>(source).ptr() != controller_) {
     NOTREACHED();
     return;
   }
+  if (type == content::NOTIFICATION_WEB_CONTENTS_DESTROYED &&
+      &content::Source<content::WebContents>(source).ptr()->
+          GetController() != controller_) {
+    NOTREACHED();
+    return;
+  }
 
   switch (type) {
     case content::NOTIFICATION_NAV_ENTRY_PENDING: {
       // NOTE: resetting state on a pending navigate isn't ideal. In particular
       // it is possible that queued up downloads for the page before the
       // pending navigate will be delivered to us after we process this
       // request. If this happens we may let a download through that we
       // shouldn't have. But this is rather rare, and it is difficult to get
       // 100% right, so we don't deal with it.
       NavigationEntry* entry = controller_->GetPendingEntry();
@@ skipping 11 matching lines @@
         // reset the download state if the user is navigating to a different
         // host (or host is empty).
         if (!initial_page_host_.empty() && !entry->GetURL().host().empty() &&
             entry->GetURL().host() == initial_page_host_) {
           return;
         }
       }
       break;
     }
 
-    case content::NOTIFICATION_TAB_CLOSED:
+    case content::NOTIFICATION_WEB_CONTENTS_DESTROYED:
       // Tab closed, no need to handle closing the dialog as it's owned by the
       // TabContents, break so that we get deleted after switch.
       break;
 
     default:
       NOTREACHED();
   }
 
   NotifyCallbacks(false);
   host_->Remove(this);
@@ skipping 184 matching lines @@
 
 void DownloadRequestLimiter::Remove(TabDownloadState* state) {
   DCHECK(ContainsKey(state_map_, state->controller()));
   state_map_.erase(state->controller());
   delete state;
 }
 
 // static
 DownloadRequestLimiter::TestingDelegate* DownloadRequestLimiter::delegate_ =
     NULL;