Deprecate ShillNetworkClient and add GeolocationHandler

chromeos/dbus/shill_manager_client.h

 // 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.
 
 #ifndef CHROMEOS_DBUS_SHILL_MANAGER_CLIENT_H_
 #define CHROMEOS_DBUS_SHILL_MANAGER_CLIENT_H_
 
 #include <string>
 
 #include "base/basictypes.h"
@@ skipping 20 matching lines @@
   typedef ShillClientHelper::PropertyChangedHandler PropertyChangedHandler;
   typedef ShillClientHelper::DictionaryValueCallback DictionaryValueCallback;
   typedef ShillClientHelper::ErrorCallback ErrorCallback;
 
   // Interface for setting up devices, services, and technologies for testing.
   // Accessed through GetTestInterface(), only implemented in the Stub Impl.
   class TestInterface {
    public:
     virtual void AddDevice(const std::string& device_path) = 0;
     virtual void RemoveDevice(const std::string& device_path) = 0;
+    virtual void ResetDevices() = 0;
     virtual void AddService(const std::string& service_path,
                             bool add_to_watch_list) = 0;
     virtual void AddServiceAtIndex(const std::string& service_path,
                                    size_t index,
                                    bool add_to_watch_list) = 0;
     virtual void RemoveService(const std::string& service_path) = 0;
     virtual void AddTechnology(const std::string& type, bool enabled) = 0;
     virtual void RemoveTechnology(const std::string& type) = 0;
+    virtual void AddGeoNetwork(const std::string& technology,
+                               const base::DictionaryValue& network) = 0;
 
     // Used to reset all properties; does not notify observers.
     virtual void ClearProperties() = 0;
 
    protected:
     ~TestInterface() {}
   };
 
   virtual ~ShillManagerClient();
 
@@ skipping 11 matching lines @@
       ShillPropertyChangedObserver* observer) = 0;
 
   // Calls GetProperties method.
   // |callback| is called after the method call succeeds.
   virtual void GetProperties(const DictionaryValueCallback& callback) = 0;
 
   // DEPRECATED DO NOT USE: Calls GetProperties method and blocks until the
   // method call finishes.  The caller is responsible to delete the result.
   // Thie method returns NULL when method call fails.
   //
-  // TODO(hashimoto): Refactor CrosGetWifiAccessPoints and remove this method.
+  // TODO(hashimoto): Refactor blocking calls and remove this method.
   // crosbug.com/29902
   virtual base::DictionaryValue* CallGetPropertiesAndBlock() = 0;
 
+  // Calls GetNetworksForGeolocation method.
+  // |callback| is called after the method call succeeds.
+  virtual void GetNetworksForGeolocation(
+      const DictionaryValueCallback& callback) = 0;
+
   // Calls SetProperty method.
   // |callback| is called after the method call succeeds.
   virtual void SetProperty(const std::string& name,
                            const base::Value& value,
                            const base::Closure& callback,
                            const ErrorCallback& error_callback) = 0;
 
   // Calls RequestScan method.
   // |callback| is called after the method call succeeds.
   virtual void RequestScan(const std::string& type,
@@ skipping 31 matching lines @@
   // Create() should be used instead.
   ShillManagerClient();
 
  private:
   DISALLOW_COPY_AND_ASSIGN(ShillManagerClient);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROMEOS_DBUS_SHILL_MANAGER_CLIENT_H_