chromeos: Split NetworkChangeNotifierChromeos initialization.

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 c4126eae42b240350305b416ed97619fc89be677..326e12f86699f6264bab9e53404753aca7e91e65 100644
--- a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
+++ b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
@@ -17,6 +17,7 @@
 #include "chrome/browser/chromeos/dbus/session_manager_client.h"
 #include "chrome/browser/chromeos/login/session_manager_observer.h"
 #include "chrome/browser/chromeos/net/cros_network_change_notifier_factory.h"
+#include "chrome/browser/chromeos/net/network_change_notifier_chromeos.h"
 #include "chrome/browser/chromeos/system/statistics_provider.h"
 #include "chrome/browser/defaults.h"
 #include "chrome/common/chrome_switches.h"
@@ -158,4 +159,14 @@ void ChromeBrowserMainPartsChromeos::PostMainMessageLoopStart() {
   if (parsed_command_line().HasSwitch(switches::kEnableBluetooth)) {
     chromeos::BluetoothManager::Initialize();
   }
+
+  // Initialize the network change notifier for Chrome OS.
+  chromeos::NetworkChangeNotifierChromeos* network_change_notifier =
+      chromeos::CrosNetworkChangeNotifierFactory::GetInstance();
+  chromeos::NetworkLibrary* network_library =
+      chromeos::CrosLibrary::Get()->GetNetworkLibrary();
+  network_change_notifier->Init(network_library);

[stevenjb, 2011/11/03 20:47:56]

I like this much better, but now we should move adding the observers to
NetworkChangeNotifierChromeos::Init(), since we remove them in
~NetworkChangeNotifierChromeos().

[satorux1, 2011/11/03 21:05:53]

Good catch. I forgot about removal of observers. I moved the observer setup to
NetworkChangeNotifierChromeos::Init()

+  network_library->AddNetworkManagerObserver(network_change_notifier);
+  chromeos::CrosLibrary::Get()->GetPowerLibrary()
+      ->AddObserver(network_change_notifier);
 }