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

chrome/browser/google/google_url_tracker.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/google/google_url_tracker.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 309 matching lines @@
                                const content::NotificationDetails& details) {
   switch (type) {
     case content::NOTIFICATION_NAV_ENTRY_PENDING: {
       NavigationController* controller =
           content::Source<NavigationController>(source).ptr();
       OnNavigationPending(source, controller->GetPendingEntry()->GetURL());
       break;
     }
 
     case content::NOTIFICATION_NAV_ENTRY_COMMITTED:
-    case content::NOTIFICATION_TAB_CLOSED:
       OnNavigationCommittedOrTabClosed(
           content::Source<NavigationController>(source).ptr()->
               GetWebContents(), type);
       break;
 
+    case content::NOTIFICATION_WEB_CONTENTS_DESTROYED:
+      OnNavigationCommittedOrTabClosed(
+          content::Source<content::WebContents>(source).ptr(), type);
+      break;
+
     default:
       NOTREACHED() << "Unknown notification received:" << type;
   }
 }
 
 void GoogleURLTracker::OnIPAddressChanged() {
   already_fetched_ = false;
   StartFetchIfDesirable();
 }
 
@@ skipping 10 matching lines @@
     const content::NotificationSource& source,
     const GURL& pending_url) {
   controller_ = content::Source<NavigationController>(source).ptr();
   search_url_ = pending_url;
   registrar_.Remove(this, content::NOTIFICATION_NAV_ENTRY_PENDING,
       content::NotificationService::AllBrowserContextsAndSources());
   // Start listening for the commit notification. We also need to listen for the
   // tab close command since that means the load will never commit.
   registrar_.Add(this, content::NOTIFICATION_NAV_ENTRY_COMMITTED,
                  content::Source<NavigationController>(controller_));
-  registrar_.Add(this, content::NOTIFICATION_TAB_CLOSED,
-                 content::Source<NavigationController>(controller_));
+  registrar_.Add(
+      this,
+      content::NOTIFICATION_WEB_CONTENTS_DESTROYED,
+      content::Source<content::WebContents>(controller_->GetWebContents()));
 }
 
 void GoogleURLTracker::OnNavigationCommittedOrTabClosed(
     WebContents* web_contents,
     int type) {
   registrar_.RemoveAll();
 
   if (type == content::NOTIFICATION_NAV_ENTRY_COMMITTED) {
     ShowGoogleURLInfoBarIfNecessary(web_contents);
   } else {
@@ skipping 10 matching lines @@
 
   // |tab_contents| can be NULL during tests.
   InfoBarTabHelper* infobar_helper = NULL;
   if (web_contents) {
     TabContentsWrapper* wrapper =
         TabContentsWrapper::GetCurrentWrapperForContents(web_contents);
     infobar_helper = wrapper->infobar_tab_helper();
   }
   infobar_ = (*infobar_creator_)(infobar_helper, this, fetched_google_url_);
 }