Reimplement CrosGetWifiAccessPoints without Libcros

chromeos/dbus/flimflam_manager_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/flimflam_manager_client.h"
 
 #include "base/bind.h"
 #include "base/chromeos/chromeos_version.h"
 #include "base/message_loop.h"
 #include "base/values.h"
@@ skipping 55 matching lines @@
   virtual void ResetPropertyChangedHandler() OVERRIDE {
     helper_.ResetPropertyChangedHandler();
   }
 
   virtual void GetProperties(const DictionaryValueCallback& callback) OVERRIDE {
     dbus::MethodCall method_call(flimflam::kFlimflamManagerInterface,
                                  flimflam::kGetPropertiesFunction);
     helper_.CallDictionaryValueMethod(&method_call, callback);
   }
 
+  virtual base::DictionaryValue* CallGetPropertiesAndBlock() OVERRIDE {
+    dbus::MethodCall method_call(flimflam::kFlimflamManagerInterface,
+                                 flimflam::kGetPropertiesFunction);
+    return helper_.CallDictionaryValueMethodAndBlock(&method_call);
+  }
+
   virtual void SetProperty(const std::string& name,
                            const base::Value& value,
                            const VoidCallback& callback) OVERRIDE {
     dbus::MethodCall method_call(flimflam::kFlimflamManagerInterface,
                                  flimflam::kSetPropertyFunction);
     dbus::MessageWriter writer(&method_call);
     writer.AppendString(name);
     dbus::AppendBasicTypeValueData(&writer, value);
     helper_.CallVoidMethod(&method_call, callback);
   }
@@ skipping 69 matching lines @@
   // FlimflamManagerClient override.
   virtual void GetProperties(const DictionaryValueCallback& callback) OVERRIDE {
     MessageLoop::current()->PostTask(
         FROM_HERE, base::Bind(
             &FlimflamManagerClientStubImpl::PassEmptyDictionaryValue,
             weak_ptr_factory_.GetWeakPtr(),
             callback));
   }
 
   // FlimflamManagerClient override.
+  virtual base::DictionaryValue* CallGetPropertiesAndBlock() OVERRIDE {
+    return new base::DictionaryValue;
+  }
+
+  // FlimflamManagerClient override.
   virtual void SetProperty(const std::string& name,
                            const base::Value& value,
                            const VoidCallback& callback) OVERRIDE {
     MessageLoop::current()->PostTask(FROM_HERE,
                                      base::Bind(callback,
                                                 DBUS_METHOD_CALL_SUCCESS));
   }
 
   // FlimflamManagerClient override.
   virtual void RequestScan(const std::string& type,
@@ skipping 57 matching lines @@
 FlimflamManagerClient* FlimflamManagerClient::Create(
     DBusClientImplementationType type,
     dbus::Bus* bus) {
   if (type == REAL_DBUS_CLIENT_IMPLEMENTATION)
     return new FlimflamManagerClientImpl(bus);
   DCHECK_EQ(STUB_DBUS_CLIENT_IMPLEMENTATION, type);
   return new FlimflamManagerClientStubImpl();
 }
 
 }  // namespace chromeos