Deprecate ShillNetworkClient and add GeolocationHandler

chromeos/dbus/dbus_thread_manager.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 "chromeos/dbus/dbus_thread_manager.h"
 
 #include <map>
 
 #include "base/chromeos/chromeos_version.h"
 #include "base/command_line.h"
 #include "base/observer_list.h"
 #include "base/threading/thread.h"
 #include "chromeos/chromeos_switches.h"
 #include "chromeos/dbus/bluetooth_adapter_client.h"
 #include "chromeos/dbus/bluetooth_device_client.h"
 #include "chromeos/dbus/bluetooth_input_client.h"
 #include "chromeos/dbus/bluetooth_manager_client.h"
 #include "chromeos/dbus/bluetooth_node_client.h"
 #include "chromeos/dbus/bluetooth_out_of_band_client.h"
 #include "chromeos/dbus/cros_disks_client.h"
 #include "chromeos/dbus/cryptohome_client.h"
 #include "chromeos/dbus/dbus_client_implementation_type.h"
 #include "chromeos/dbus/dbus_thread_manager_observer.h"
 #include "chromeos/dbus/debug_daemon_client.h"
 #include "chromeos/dbus/shill_device_client.h"
 #include "chromeos/dbus/shill_ipconfig_client.h"
 #include "chromeos/dbus/shill_manager_client.h"
-#include "chromeos/dbus/shill_network_client.h"
 #include "chromeos/dbus/shill_profile_client.h"
 #include "chromeos/dbus/shill_service_client.h"
 #include "chromeos/dbus/gsm_sms_client.h"
 #include "chromeos/dbus/ibus/ibus_client.h"
 #include "chromeos/dbus/ibus/ibus_config_client.h"
 #include "chromeos/dbus/ibus/ibus_engine_factory_service.h"
 #include "chromeos/dbus/ibus/ibus_engine_service.h"
 #include "chromeos/dbus/ibus/ibus_input_context_client.h"
 #include "chromeos/dbus/ibus/ibus_panel_service.h"
 #include "chromeos/dbus/image_burner_client.h"
@@ skipping 56 matching lines @@
     cryptohome_client_.reset(
         CryptohomeClient::Create(client_type, system_bus_.get()));
     debug_daemon_client_.reset(
         DebugDaemonClient::Create(client_type, system_bus_.get()));
     shill_device_client_.reset(
         ShillDeviceClient::Create(client_type, system_bus_.get()));
     shill_ipconfig_client_.reset(
         ShillIPConfigClient::Create(client_type, system_bus_.get()));
     shill_manager_client_.reset(
         ShillManagerClient::Create(client_type, system_bus_.get()));
-    shill_network_client_.reset(
-        ShillNetworkClient::Create(client_type, system_bus_.get()));
     shill_profile_client_.reset(
         ShillProfileClient::Create(client_type, system_bus_.get()));
     shill_service_client_.reset(
         ShillServiceClient::Create(client_type, system_bus_.get()));
     gsm_sms_client_.reset(
         GsmSMSClient::Create(client_type, system_bus_.get()));
     image_burner_client_.reset(ImageBurnerClient::Create(client_type,
                                                          system_bus_.get()));
     introspectable_client_.reset(
         IntrospectableClient::Create(client_type, system_bus_.get()));
@@ skipping 129 matching lines @@
   }
 
   virtual ShillIPConfigClient* GetShillIPConfigClient() OVERRIDE {
     return shill_ipconfig_client_.get();
   }
 
   virtual ShillManagerClient* GetShillManagerClient() OVERRIDE {
     return shill_manager_client_.get();
   }
 
-  virtual ShillNetworkClient* GetShillNetworkClient() OVERRIDE {
-    return shill_network_client_.get();
-  }
-
   virtual ShillProfileClient* GetShillProfileClient() OVERRIDE {
     return shill_profile_client_.get();
   }
 
   virtual ShillServiceClient* GetShillServiceClient() OVERRIDE {
     return shill_service_client_.get();
   }
 
   virtual GsmSMSClient* GetGsmSMSClient() OVERRIDE {
     return gsm_sms_client_.get();
@@ skipping 92 matching lines @@
   scoped_ptr<BluetoothInputClient> bluetooth_input_client_;
   scoped_ptr<BluetoothManagerClient> bluetooth_manager_client_;
   scoped_ptr<BluetoothNodeClient> bluetooth_node_client_;
   scoped_ptr<BluetoothOutOfBandClient> bluetooth_out_of_band_client_;
   scoped_ptr<CrosDisksClient> cros_disks_client_;
   scoped_ptr<CryptohomeClient> cryptohome_client_;
   scoped_ptr<DebugDaemonClient> debug_daemon_client_;
   scoped_ptr<ShillDeviceClient> shill_device_client_;
   scoped_ptr<ShillIPConfigClient> shill_ipconfig_client_;
   scoped_ptr<ShillManagerClient> shill_manager_client_;
-  scoped_ptr<ShillNetworkClient> shill_network_client_;
   scoped_ptr<ShillProfileClient> shill_profile_client_;
   scoped_ptr<ShillServiceClient> shill_service_client_;
   scoped_ptr<GsmSMSClient> gsm_sms_client_;
   scoped_ptr<ImageBurnerClient> image_burner_client_;
   scoped_ptr<IntrospectableClient> introspectable_client_;
   scoped_ptr<ModemMessagingClient> modem_messaging_client_;
   scoped_ptr<PermissionBrokerClient> permission_broker_client_;
   scoped_ptr<PowerManagerClient> power_manager_client_;
   scoped_ptr<RootPowerManagerClient> root_power_manager_client_;
   scoped_ptr<SessionManagerClient> session_manager_client_;
@@ skipping 78 matching lines @@
 }
 
 // static
 DBusThreadManager* DBusThreadManager::Get() {
   CHECK(g_dbus_thread_manager)
       << "DBusThreadManager::Get() called before Initialize()";
   return g_dbus_thread_manager;
 }
 
 }  // namespace chromeos