Deprecate ShillNetworkClient and add GeolocationHandler

chromeos/dbus/shill_device_client.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/shill_device_client.h"
 
 #include "base/bind.h"
 #include "base/message_loop.h"
 #include "base/stl_util.h"
 #include "base/values.h"
@@ skipping 357 matching lines @@
   }
 
   virtual ShillDeviceClient::TestInterface* GetTestInterface() OVERRIDE {
     return this;
   }
 
   // ShillDeviceClient::TestInterface overrides.
 
   virtual void AddDevice(const std::string& device_path,
                          const std::string& type,
-                         const std::string& object_path,
-                         const std::string& connection_path) OVERRIDE {
+                         const std::string& object_path) OVERRIDE {
     base::DictionaryValue* properties = GetDeviceProperties(device_path);
     properties->SetWithoutPathExpansion(
         flimflam::kTypeProperty,
         base::Value::CreateStringValue(type));
     properties->SetWithoutPathExpansion(
         flimflam::kDBusObjectProperty,
         base::Value::CreateStringValue(object_path));
     properties->SetWithoutPathExpansion(
         flimflam::kDBusConnectionProperty,
-        base::Value::CreateStringValue(connection_path));
+        base::Value::CreateStringValue("/stub"));
   }
 
   virtual void RemoveDevice(const std::string& device_path) OVERRIDE {
     stub_devices_.RemoveWithoutPathExpansion(device_path, NULL);
   }
 
   virtual void ClearDevices() OVERRIDE {
     stub_devices_.Clear();
   }
 
+  virtual void SetDeviceProperty(const std::string& device_path,
+                                 const std::string& name,
+                                 const base::Value& value) {
+    SetProperty(dbus::ObjectPath(device_path), name, value,
+                base::Bind(&base::DoNothing),
+                base::Bind(&ShillDeviceClientStubImpl::ErrorFunction));
+  }
+
  private:
   typedef ObserverList<ShillPropertyChangedObserver> PropertyObserverList;
 
   void SetDefaultProperties() {
     // Add a wifi device. Note: path matches Manager entry.
-    AddDevice("stub_wifi_device1", flimflam::kTypeWifi,
-              "/device/wifi1", "/stub");
+    AddDevice("stub_wifi_device1", flimflam::kTypeWifi, "/device/wifi1");
 
     // Add a cellular device. Used in SMS stub. Note: path matches
     // Manager entry.
     AddDevice("stub_cellular_device1", flimflam::kTypeCellular,
-              "/device/cellular1", "/stub");
+              "/device/cellular1");
   }
 
   void PassStubDeviceProperties(const dbus::ObjectPath& device_path,
                                 const DictionaryValueCallback& callback) const {
     const base::DictionaryValue* device_properties = NULL;
     if (!stub_devices_.GetDictionaryWithoutPathExpansion(
             device_path.value(), &device_properties)) {
       base::DictionaryValue empty_dictionary;
       callback.Run(DBUS_METHOD_CALL_FAILURE, empty_dictionary);
       return;
@@ skipping 42 matching lines @@
   PropertyObserverList& GetObserverList(const dbus::ObjectPath& device_path) {
     std::map<dbus::ObjectPath, PropertyObserverList*>::iterator iter =
         observer_list_.find(device_path);
     if (iter != observer_list_.end())
       return *(iter->second);
     PropertyObserverList* observer_list = new PropertyObserverList();
     observer_list_[device_path] = observer_list;
     return *observer_list;
   }
 
+  static void ErrorFunction(const std::string& error_name,
+                            const std::string& error_message) {
+    LOG(ERROR) << "Shill Error: " << error_name << " : " << error_message;
+  }
+
   // Dictionary of <device_name, Dictionary>.
   base::DictionaryValue stub_devices_;
   // Observer list for each device.
   std::map<dbus::ObjectPath, PropertyObserverList*> observer_list_;
 
   // Note: This should remain the last member so it'll be destroyed and
   // invalidate its weak pointers before any other members are destroyed.
   base::WeakPtrFactory<ShillDeviceClientStubImpl> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ShillDeviceClientStubImpl);
 };
 
 }  // namespace
 
 ShillDeviceClient::ShillDeviceClient() {}
 
 ShillDeviceClient::~ShillDeviceClient() {}
 
 // static
 ShillDeviceClient* ShillDeviceClient::Create(
     DBusClientImplementationType type,
     dbus::Bus* bus) {
   if (type == REAL_DBUS_CLIENT_IMPLEMENTATION)
     return new ShillDeviceClientImpl(bus);
   DCHECK_EQ(STUB_DBUS_CLIENT_IMPLEMENTATION, type);
   return new ShillDeviceClientStubImpl();
 }
 
 }  // namespace chromeos