Deprecate ShillNetworkClient and add GeolocationHandler

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 d118334aa421e9ae7d18faaa6b71abfd5e9944c4..4bb57ae7ff42c1d18edd1d79ce4a77328535656f 100644
--- a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
+++ b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
@@ -86,9 +86,11 @@
 #include "chromeos/dbus/session_manager_client.h"
 #include "chromeos/disks/disk_mount_manager.h"
 #include "chromeos/display/output_configurator.h"
+#include "chromeos/network/geolocation_handler.h"
 #include "chromeos/network/network_change_notifier_chromeos.h"
 #include "chromeos/network/network_change_notifier_factory_chromeos.h"
 #include "chromeos/network/network_configuration_handler.h"
+#include "chromeos/network/network_device_handler.h"
 #include "chromeos/network/network_event_log.h"
 #include "chromeos/network/network_state_handler.h"
 #include "chromeos/power/power_state_override.h"
@@ -286,17 +288,23 @@ class DBusServices {
   // longer required. (Switch is set in about_flags.cc and not applied until
   // after DBusServices() is called).
   void InitializeNetworkHandlers() {
-    chromeos::network_event_log::Initialize();
-    if (!CommandLine::ForCurrentProcess()->HasSwitch(
-            chromeos::switches::kEnableNewNetworkHandlers))
-      return;
-    chromeos::NetworkStateHandler::Initialize();
-    chromeos::NetworkConfigurationHandler::Initialize();
     network_handlers_initialized_ = true;
-    // TODO(gauravsh): This needs re-factoring. NetworkChangeNotifier choice
-    // needs to be made before about:flags are processed.
-    if (use_new_network_change_notifier_)
-      NetworkChangeNotifierFactoryChromeos::GetInstance()->Initialize();
+
+    // Always initialize these handlers which should not conflict with
+    // NetworkLibrary.
+    chromeos::network_event_log::Initialize();
+    chromeos::GeolocationHandler::Initialize();
+
+    if (CommandLine::ForCurrentProcess()->HasSwitch(
+            chromeos::switches::kEnableNewNetworkHandlers)) {
+      chromeos::NetworkDeviceHandler::Initialize();
+      chromeos::NetworkStateHandler::Initialize();
+      chromeos::NetworkConfigurationHandler::Initialize();
+      // TODO(gauravsh): This needs re-factoring. NetworkChangeNotifier choice
+      // needs to be made before about:flags are processed.
+      if (use_new_network_change_notifier_)
+        NetworkChangeNotifierFactoryChromeos::GetInstance()->Initialize();
+    }
   }
 
   ~DBusServices() {
@@ -308,10 +316,16 @@ class DBusServices {
     if (cros_initialized_ && CrosLibrary::Get())
       CrosLibrary::Shutdown();
 
-    chromeos::network_event_log::Shutdown();
     if (network_handlers_initialized_) {
-      chromeos::NetworkStateHandler::Shutdown();
-      chromeos::NetworkConfigurationHandler::Shutdown();
+      if (CommandLine::ForCurrentProcess()->HasSwitch(
+              chromeos::switches::kEnableNewNetworkHandlers)) {
+        chromeos::NetworkDeviceHandler::Shutdown();
+        chromeos::NetworkStateHandler::Shutdown();
+        chromeos::NetworkConfigurationHandler::Shutdown();
+      }
+
+      chromeos::GeolocationHandler::Shutdown();
+      chromeos::network_event_log::Shutdown();
     }
 
     cryptohome::AsyncMethodCaller::Shutdown();