summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--chrome/browser/browser_main_mac.mm2
-rw-r--r--chrome/browser/cocoa/extensions/extension_popup_controller.mm2
-rw-r--r--chrome/browser/cocoa/info_bubble_window.mm1
-rw-r--r--net/base/network_change_notifier_mac.h4
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 <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"
@@ -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<base::Thread> notifier_thread_;
- ObserverList<Observer, true> observers_;
+ // 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_;
// Used to initialize the notifier thread.
ScopedRunnableMethodFactory<NetworkChangeNotifierMac> method_factory_;