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 293 matching lines @@
       // Disable Num Lock on X start up for http://crosbug.com/29169.
       input_method::GetInputMethodManager()->GetXKeyboard()->
           SetNumLockEnabled(false);
     }
 
     // Initialize the device settings service so that we'll take actions per
     // signals sent from the session manager.
     DeviceSettingsService::Get()->Initialize(
         DBusThreadManager::Get()->GetSessionManagerClient(),
         OwnerKeyUtil::Create());
+    chromeos::ConnectivityStateHelper::Initialize();
   }
 
   ~DBusServices() {
+    chromeos::ConnectivityStateHelper::Shutdown();
     // CrosLibrary is shut down before DBusThreadManager even though it
     // 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 88 matching lines @@
   message_loop->AddObserver(g_message_loop_observer.Pointer());
 
   dbus_services_.reset(new internal::DBusServices(parameters()));
 
   ChromeBrowserMainPartsLinux::PostMainMessageLoopStart();
 }
 
 // Threads are initialized between MainMessageLoopStart and MainMessageLoopRun.
 // about_flags settings are applied in ChromeBrowserMainParts::PreCreateThreads.
 void ChromeBrowserMainPartsChromeos::PreMainMessageLoopRun() {
-  // Must be called after about_flags settings are applied (see note above).
-  chromeos::ConnectivityStateHelper::Initialize();
-
   AudioHandler::Initialize();
   imageburner::BurnManager::Initialize();
 
   // Listen for system key events so that the user will be able to adjust the
   // volume on the login screen, if Chrome is running on Chrome OS
   // (i.e. not Linux desktop), and in non-test mode.
   // Note: SystemKeyEventListener depends on the DBus thread.
   if (base::chromeos::IsRunningOnChromeOS() &&
       !parameters().ui_task) {  // ui_task is non-NULL when running tests.
     SystemKeyEventListener::Initialize();
@@ skipping 401 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