From 97d052416394e439380cb932dfaed867e9db650b Mon Sep 17 00:00:00 2001 From: "willchan@chromium.org" Date: Fri, 12 Mar 2010 19:57:16 +0000 Subject: Revert r41459: "Change Mac to DCHECK if NetworkChangeNotifier observer list is not empty by destruction time." Apparently NetworkChangeNotifierMac's observers are still getting leaked in ExtensionApiTest.ShowPageActionPopup. Review URL: http://codereview.chromium.org/871007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@41464 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/browser_main_mac.mm | 2 -- chrome/browser/cocoa/extensions/extension_popup_controller.mm | 2 -- chrome/browser/cocoa/info_bubble_window.mm | 1 - net/base/network_change_notifier_mac.h | 4 +++- 4 files changed, 3 insertions(+), 6 deletions(-) diff --git a/chrome/browser/browser_main_mac.mm b/chrome/browser/browser_main_mac.mm index 2195761..7163618 100644 --- a/chrome/browser/browser_main_mac.mm +++ b/chrome/browser/browser_main_mac.mm @@ -61,11 +61,9 @@ 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 58a79e1..72271b5 100644 --- a/chrome/browser/cocoa/extensions/extension_popup_controller.mm +++ b/chrome/browser/cocoa/extensions/extension_popup_controller.mm @@ -6,7 +6,6 @@ #include -#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" @@ -92,7 +91,6 @@ 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 7daa65a..0a65367 100644 --- a/chrome/browser/cocoa/info_bubble_window.mm +++ b/chrome/browser/cocoa/info_bubble_window.mm @@ -43,7 +43,6 @@ 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 01a491f..44d4806 100644 --- a/net/base/network_change_notifier_mac.h +++ b/net/base/network_change_notifier_mac.h @@ -51,7 +51,9 @@ class NetworkChangeNotifierMac : public NetworkChangeNotifier { // Receives the OS X network change notifications on this thread. scoped_ptr notifier_thread_; - ObserverList observers_; + // TODO(willchan): Fix the URLRequestContextGetter leaks and flip the false to + // true so we assert that all observers have been removed. + ObserverList observers_; // Used to initialize the notifier thread. ScopedRunnableMethodFactory method_factory_; -- cgit v1.1