Landing change for ers@chromium.org: http://codereview.chromium.org/4134012/s...

chrome/browser/chromeos/network_state_notifier.cc

Index: chrome/browser/chromeos/network_state_notifier.cc
===================================================================
--- chrome/browser/chromeos/network_state_notifier.cc	(revision 65103)
+++ chrome/browser/chromeos/network_state_notifier.cc	(working copy)
@@ -34,9 +34,19 @@
     : ALLOW_THIS_IN_INITIALIZER_LIST(task_factory_(this)),
       state_(RetrieveState()),
       offline_start_time_(Time::Now()) {
+  // Note that this gets added as a NetworkManagerObserver
+  // in browser_init.cc
 }
 
-void NetworkStateNotifier::NetworkChanged(NetworkLibrary* cros) {
+NetworkStateNotifier::~NetworkStateNotifier() {
+  // Let the NetworkManagerObserver leak to avoid a DCHECK
+  // failure in CommandLine::ForCurrentProcess.
+//  if (CrosLibrary::Get()->EnsureLoaded())
+//    CrosLibrary::Get()->GetNetworkLibrary()->
+//        RemoveNetworkManagerObserver(this);
+}
+
+void NetworkStateNotifier::OnNetworkManagerChanged(NetworkLibrary* cros) {
   DCHECK(CrosLibrary::Get()->EnsureLoaded());
   BrowserThread::PostTask(
       BrowserThread::UI, FROM_HERE,