Make ~WebNavigationEventRouter remove itself from browsers

chrome/browser/extensions/api/web_navigation/web_navigation_api.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.
 
 // Implements the Chrome Extensions WebNavigation API.
 
 #include "chrome/browser/extensions/api/web_navigation/web_navigation_api.h"
 
 #include "base/lazy_instance.h"
 #include "chrome/browser/chrome_notification_types.h"
@@ skipping 73 matching lines @@
                  chrome::NOTIFICATION_RETARGETING,
                  content::NotificationService::AllSources());
   registrar_.Add(this,
                  chrome::NOTIFICATION_TAB_ADDED,
                  content::NotificationService::AllSources());
   registrar_.Add(this,
                  content::NOTIFICATION_WEB_CONTENTS_DESTROYED,
                  content::NotificationService::AllSources());
 
   BrowserList::AddObserver(this);
-  for (chrome::BrowserIterator it; !it.done(); it.Next()) {
+  for (chrome::BrowserIterator it; !it.done(); it.Next())
     OnBrowserAdded(*it);
-  }
 }
 
 WebNavigationEventRouter::~WebNavigationEventRouter() {
+  for (chrome::BrowserIterator it; !it.done(); it.Next())
+    OnBrowserRemoved(*it);
   BrowserList::RemoveObserver(this);
 }
 
 void WebNavigationEventRouter::OnBrowserAdded(Browser* browser) {
   if (!profile_->IsSameProfile(browser->profile()))
     return;
   browser->tab_strip_model()->AddObserver(this);
 }
 
 void WebNavigationEventRouter::OnBrowserRemoved(Browser* browser) {
@@ skipping 747 matching lines @@
 }
 
 void WebNavigationAPI::OnListenerAdded(const EventListenerInfo& details) {
   web_navigation_event_router_.reset(new WebNavigationEventRouter(profile_));
   ExtensionSystem::Get(profile_)->event_router()->UnregisterObserver(this);
 }
 
 #endif  // OS_ANDROID
 
 }  // namespace extensions