chromeos: Split NetworkChangeNotifierChromeos initialization.

chrome/browser/chromeos/chrome_browser_main_chromeos.cc

 // Copyright (c) 2011 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 "base/bind.h"
 #include "base/callback.h"
 #include "base/command_line.h"
 #include "base/lazy_instance.h"
 #include "base/message_loop.h"
 #include "chrome/browser/chromeos/bluetooth/bluetooth_manager.h"
 #include "chrome/browser/chromeos/boot_times_loader.h"
 #include "chrome/browser/chromeos/brightness_observer.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/dbus/dbus_thread_manager.h"
 #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"
 #include "content/public/common/main_function_params.h"
 #include "net/base/network_change_notifier.h"
 
 #if defined(TOOLKIT_USES_GTK)
 #include <gtk/gtk.h>
 #endif
 
@@ skipping 121 matching lines @@
   // Initialize the session manager observer so that we'll take actions
   // per signals sent from the session manager.
   session_manager_observer_.reset(new chromeos::SessionManagerObserver);
   chromeos::DBusThreadManager::Get()->GetSessionManagerClient()->
       AddObserver(session_manager_observer_.get());
 
   // Initialize the Chrome OS bluetooth subsystem
   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);
 }