Add a unified observer to replace NetworkManagerObserver

chrome/browser/chromeos/chrome_browser_main_chromeos.cc

 // Copyright (c) 2013 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/chrome_browser_main_chromeos.h"
 
 #include <string>
 #include <vector>
 
 #include "ash/shell.h"
@@ skipping 307 matching lines @@
     // is initialized first becuase some of its libraries depend on DBus
     // clients.
     // TODO(hashimoto): Resolve this situation by removing CrosLibrary.
     // (crosbug.com/26160)
     if (cros_initialized_ && CrosLibrary::Get())
       CrosLibrary::Shutdown();
 
     chromeos::ManagedNetworkConfigurationHandler::Shutdown();
     chromeos::NetworkConfigurationHandler::Shutdown();
 
-    chromeos::ConnectivityStateHelper::Shutdown();
     chromeos::NetworkStateHandler::Shutdown();
     chromeos::GeolocationHandler::Shutdown();
     chromeos::network_event_log::Shutdown();
 
     cryptohome::AsyncMethodCaller::Shutdown();
     disks::DiskMountManager::Shutdown();
     input_method::Shutdown();
     CrosDBusService::Shutdown();
     // NOTE: This must only be called if Initialize() was called.
     DBusThreadManager::Shutdown();
@@ skipping 376 matching lines @@
 
   // The XInput2 event listener needs to be shut down earlier than when
   // Singletons are finally destroyed in AtExitManager.
   XInputHierarchyChangedEventListener::GetInstance()->Stop();
 
   // chromeos::SystemKeyEventListener::Shutdown() is always safe to call,
   // even if Initialize() wasn't called.
   SystemKeyEventListener::Shutdown();
   imageburner::BurnManager::Shutdown();
   AudioHandler::Shutdown();
+  // ConnectivityStateHelper needs to unregister itself as the observer
+  // of NetworkLibrary/NetworkStateHandler before DBusServices is shut down.
+  chromeos::ConnectivityStateHelper::Shutdown();

[stevenjb, 2013/03/14 00:10:47]

It would be nice if this could be initialized at the end of DBusServices() and
shut down at the beginning, what are the barriers to that?

[gauravsh, 2013/03/14 01:06:11]

We initialize ConnectivityStateHelper in PreMainMessageLoopRun, so it happens
after about:flags settings are applied. I added shutdown here in
PostMainMessageLoopRun to match that. 

[stevenjb, 2013/03/14 01:40:56]

Ah, right, good old about_flags, forgot about that. OK.

 
   WebSocketProxyController::Shutdown();
 
   // Let classes unregister themselves as observers of the ash::Shell singleton
   // before the shell is destroyed.
   user_activity_notifier_.reset();
   video_activity_notifier_.reset();
   primary_display_switch_observer_.reset();
 
   // Detach D-Bus clients before DBusThreadManager is shut down.
@@ skipping 116 matching lines @@
     return;
 
   // If failed to launch, go back to login screen.
   LOG(ERROR) << "Failed to launch kiosk app. Fall back to login screen";
   OptionallyRunChromeOSLoginManager(parsed_command_line(), profile());
 
   // TODO(xiyuan): Show error message.
 }
 
 }  //  namespace chromeos