Change Mac to DCHECK if NetworkChangeNotifier observer list is not empty by destruction time.

Review URL: http://codereview.chromium.org/870003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@41459 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 6 insertions, 3 deletions

diff --git a/chrome/browser/browser_main_mac.mm b/chrome/browser/browser_main_mac.mm
index 7163618..2195761 100644
--- a/chrome/browser/browser_main_mac.mm
+++ b/chrome/browser/browser_main_mac.mm
@@ -61,9 +61,11 @@ void WillInitializeMainMessageLoop(const MainFunctionParams& parameters) {
 void DidEndMainMessageLoop() {
   AppController* appController = [NSApp delegate];
   [appController didEndMainMessageLoop];
+  LOG(ERROR) << "Notifying APP_TERMINATING.";
   NotificationService::current()->Notify(NotificationType::APP_TERMINATING,
                                          NotificationService::AllSources(),
                                          NotificationService::NoDetails());
+  LOG(ERROR) << "Notified APP_TERMINATING.";
 }
 
 void RecordBreakpadStatusUMA(MetricsService* metrics) {
diff --git a/chrome/browser/cocoa/extensions/extension_popup_controller.mm b/chrome/browser/cocoa/extensions/extension_popup_controller.mm
index 72271b5..58a79e1 100644
--- a/chrome/browser/cocoa/extensions/extension_popup_controller.mm
+++ b/chrome/browser/cocoa/extensions/extension_popup_controller.mm
@@ -6,6 +6,7 @@
 
 #include <algorithm>
 
+#include "base/logging.h"
 #include "chrome/browser/browser.h"
 #import "chrome/browser/cocoa/browser_window_cocoa.h"
 #import "chrome/browser/cocoa/extension_view_mac.h"
@@ -91,6 +92,7 @@ CGFloat Clamp(CGFloat value, CGFloat min, CGFloat max) {
 }
 
 - (void)dealloc {
+  LOG(ERROR) << "Yep, I'm getting deleted.";
   [[NSNotificationCenter defaultCenter] removeObserver:self];
   [super dealloc];
 }
diff --git a/chrome/browser/cocoa/info_bubble_window.mm b/chrome/browser/cocoa/info_bubble_window.mm
index 0a65367..7daa65a 100644
--- a/chrome/browser/cocoa/info_bubble_window.mm
+++ b/chrome/browser/cocoa/info_bubble_window.mm
@@ -43,6 +43,7 @@ class AppNotificationBridge : public NotificationObserver {
                const NotificationDetails& details) {
     switch (type.value) {
       case NotificationType::APP_TERMINATING:
+	LOG(ERROR) << "Received notification.";
         [owner_ appIsTerminating];
         break;
       default:
diff --git a/net/base/network_change_notifier_mac.h b/net/base/network_change_notifier_mac.h
index 44d4806..01a491f 100644
--- a/net/base/network_change_notifier_mac.h
+++ b/net/base/network_change_notifier_mac.h
@@ -51,9 +51,7 @@ class NetworkChangeNotifierMac : public NetworkChangeNotifier {
   // Receives the OS X network change notifications on this thread.
   scoped_ptr<base::Thread> notifier_thread_;
 
-  // TODO(willchan): Fix the URLRequestContextGetter leaks and flip the false to
-  // true so we assert that all observers have been removed.
-  ObserverList<Observer, false> observers_;
+  ObserverList<Observer, true> observers_;
 
   // Used to initialize the notifier thread.
   ScopedRunnableMethodFactory<NetworkChangeNotifierMac> method_factory_;