Deprecate ShillNetworkClient and add GeolocationHandler

chrome/browser/chromeos/chrome_browser_main_chromeos.cc

 // Copyright (c) 2012 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 68 matching lines @@
 #include "chrome/common/chrome_version_info.h"
 #include "chrome/common/logging_chrome.h"
 #include "chrome/common/pref_names.h"
 #include "chromeos/chromeos_switches.h"
 #include "chromeos/cryptohome/async_method_caller.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/power_manager_client.h"
 #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"
 #include "content/public/browser/notification_service.h"
 #include "content/public/common/main_function_params.h"
 #include "grit/platform_locale_settings.h"
 #include "net/base/network_change_notifier.h"
 #include "net/url_request/url_request.h"
 
 namespace chromeos {
@@ skipping 177 matching lines @@
         OwnerKeyUtil::Create());
 
     // Add observers for WallpaperManager. This depends on PowerManagerClient().
     WallpaperManager::Get()->AddObservers();
   }
 
   // TODO(stevenjb): Move this into DBusServices() once the switch is no
   // longer required. (Switch is set in about_flags.cc and not applied until
   // after DBusServices() is called).
   void InitializeNetworkHandlers() {
+    network_handlers_initialized_ = true;
+
+    // Always initialize these handlers which should not conflict with
+    // NetworkLibrary.
     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();
+    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() {
     // 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::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();
     disks::DiskMountManager::Shutdown();
     input_method::Shutdown();
     CrosDBusService::Shutdown();
     // NOTE: This must only be called if Initialize() was called.
     DBusThreadManager::Shutdown();
   }
 
@@ skipping 485 matching lines @@
   trial->AppendGroup("2GB_RAM_3GB_swap", zram_group == '2' ? 1 : 0);
   trial->AppendGroup("4GB_RAM_no_swap", zram_group == '3' ? 1 : 0);
   trial->AppendGroup("4GB_RAM_4GB_swap", zram_group == '4' ? 1 : 0);
   trial->AppendGroup("4GB_RAM_6GB_swap", zram_group == '5' ? 1 : 0);
   trial->AppendGroup("snow_no_swap", zram_group == '6' ? 1 : 0);
   trial->AppendGroup("snow_1GB_swap", zram_group == '7' ? 1 : 0);
   trial->AppendGroup("snow_2GB_swap", zram_group == '8' ? 1 : 0);
 }
 
 }  //  namespace chromeos