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 ade569786abb450cbcfcbb14eee7fa022731ce04..4b729d352c66f34d1d411cac815535f8715da7e2 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,10 +288,15 @@ class DBusServices {
   // longer required. (Switch is set in about_flags.cc and not applied until
   // after DBusServices() is called).
   void InitializeNetworkHandlers() {
+    // 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))
       return;
-    chromeos::network_event_log::Initialize();
+    chromeos::NetworkDeviceHandler::Initialize();
     chromeos::NetworkStateHandler::Initialize();
     chromeos::NetworkConfigurationHandler::Initialize();
     network_handlers_initialized_ = true;
@@ -308,10 +315,13 @@ class DBusServices {
     if (cros_initialized_ && CrosLibrary::Get())
       CrosLibrary::Shutdown();
 
+    chromeos::network_event_log::Shutdown();
+    chromeos::GeolocationHandler::Shutdown();
+
     if (network_handlers_initialized_) {
+      chromeos::NetworkDeviceHandler::Shutdown();
       chromeos::NetworkStateHandler::Shutdown();
       chromeos::NetworkConfigurationHandler::Shutdown();
-      chromeos::network_event_log::Shutdown();
     }
 
     cryptohome::AsyncMethodCaller::Shutdown();