buffet: Conversion between chromeos::Error and weave::Error
libweave has own error to avoid dependency on libchromeos.
BUG=brillo:1257
TEST=`FEATURES=test emerge-gizmo libweave buffet`
CQ-DEPEND=CL:293615
Change-Id: I64227cdecff29826f95df084a284935ed4ec395a
Reviewed-on: https://chromium-review.googlesource.com/293873
Reviewed-by: Alex Vakulenko <avakulenko@chromium.org>
Tested-by: Vitaly Buka <vitalybuka@chromium.org>
Commit-Queue: Vitaly Buka <vitalybuka@chromium.org>
diff --git a/buffet/shill_client.h b/buffet/shill_client.h
index 0aad908..6f14226 100644
--- a/buffet/shill_client.h
+++ b/buffet/shill_client.h
@@ -38,7 +38,7 @@
bool ConnectToService(const std::string& ssid,
const std::string& passphrase,
const base::Closure& on_success,
- chromeos::ErrorPtr* error) override;
+ weave::ErrorPtr* error) override;
weave::NetworkState GetConnectionState() const override;
void EnableAccessPoint(const std::string& ssid) override;
void DisableAccessPoint() override;
@@ -49,8 +49,7 @@
const std::string& host,
const base::Callback<void(std::unique_ptr<weave::Stream>)>&
success_callback,
- const base::Callback<void(const chromeos::Error*)>& error_callback)
- override;
+ const base::Callback<void(const weave::Error*)>& error_callback) override;
private:
struct DeviceState {
@@ -101,6 +100,11 @@
// posted.
void CleanupConnectingService(bool check_for_reset_pending);
+ bool ConnectToServiceImpl(const std::string& ssid,
+ const std::string& passphrase,
+ const base::Closure& on_success,
+ chromeos::ErrorPtr* error);
+
const scoped_refptr<dbus::Bus> bus_;
org::chromium::flimflam::ManagerProxy manager_proxy_;
// There is logic that assumes we will never change this device list