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

chrome/browser/chromeos/network_state_notifier.cc

 // Copyright (c) 2010 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.
 
 #include "chrome/browser/chromeos/network_state_notifier.h"
 
 #include "base/message_loop.h"
 #include "base/time.h"
 #include "chrome/browser/browser_thread.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
@@ skipping 16 matching lines @@
   // TODO(oshima): make this instance method so that
   // we can mock this for ui_tests.
   // http://crbug.com/4825 .
   return base::Time::Now() - Get()->offline_start_time_;
 }
 
 NetworkStateNotifier::NetworkStateNotifier()
     : 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,
       task_factory_.NewRunnableMethod(
           &NetworkStateNotifier::UpdateNetworkState,
           RetrieveState()));
 }
 
 void NetworkStateNotifier::UpdateNetworkState(
     NetworkStateDetails::State new_state) {
@@ skipping 21 matching lines @@
     return NetworkStateDetails::CONNECTED;
   } else if (cros->Connecting()) {
     return NetworkStateDetails::CONNECTING;
   } else {
     return NetworkStateDetails::DISCONNECTED;
   }
 }
 
 
 }  // namespace chromeos