Add a unified observer to replace NetworkManagerObserver

chrome/browser/chromeos/chrome_browser_main_chromeos.cc

Index: chrome/browser/chromeos/chrome_browser_main_chromeos.cc
diff --git a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
index b11f3ad98334e597208fb1c7b7b3cf61d0c14b20..4ee13c3c466146838f40575573c66f5f2a01a0ef 100644
--- a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
+++ b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
@@ -325,7 +325,6 @@ class DBusServices {
     chromeos::ManagedNetworkConfigurationHandler::Shutdown();
     chromeos::NetworkConfigurationHandler::Shutdown();
 
-    chromeos::ConnectivityStateHelper::Shutdown();
     chromeos::NetworkStateHandler::Shutdown();
     chromeos::GeolocationHandler::Shutdown();
     chromeos::network_event_log::Shutdown();
@@ -722,6 +721,9 @@ void ChromeBrowserMainPartsChromeos::PostMainMessageLoopRun() {
   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();