commit 1fd619a3ff996aac12bd0ef2ed99090e4dc6b6dd
author Vitaly Buka <vitalybuka@google.com> Thu Sep 24 11:46:05 2015 -0700
committer Vitaly Buka <vitalybuka@google.com> Thu Sep 24 19:22:10 2015 +0000
tree 74795e5851fcd0cd451c5487ba0579be1d3b919e
parent 4ebd329b95f6d596c8ec97844d346b8a3149bb76

Rename and cleanup WifiProvider
Added generic SuccessCallback and ErrorCallback.
Replaced callback with generic ones in WifiProvider and Stream.

BUG: 24267885
Change-Id: Iabdb8ed90fa463b4c8e0cae60de234f674e770ce
Reviewed-on: https://weave-review.googlesource.com/1153
Reviewed-by: Vitaly Buka <vitalybuka@google.com>

libweave/src/privet/wifi_bootstrap_manager.cc

diff --git a/libweave/src/privet/wifi_bootstrap_manager.cc b/libweave/src/privet/wifi_bootstrap_manager.cc
index 1cb3cd4..bd84e14 100644
--- a/libweave/src/privet/wifi_bootstrap_manager.cc
+++ b/libweave/src/privet/wifi_bootstrap_manager.cc
@@ -9,7 +9,7 @@
 #include <weave/enum_to_string.h>
 #include <weave/network.h>
 #include <weave/task_runner.h>
-#include <weave/wifi.h>
+#include <weave/wifi_provider.h>
 
 #include "libweave/src/bind_lambda.h"
 #include "libweave/src/privet/constants.h"
@@ -23,7 +23,7 @@
     bool ble_setup_enabled,
     TaskRunner* task_runner,
     Network* network,
-    Wifi* wifi,
+    WifiProvider* wifi,
     CloudDelegate* gcd)
     : task_runner_{task_runner},
       network_{network},
@@ -80,13 +80,13 @@
   // TODO(vitalybuka): Add SSID probing.
   privet_ssid_ = GenerateSsid();
   CHECK(!privet_ssid_.empty());
-  wifi_->EnableAccessPoint(privet_ssid_);
+  wifi_->StartAccessPoint(privet_ssid_);
   LOG_IF(INFO, ble_setup_enabled_) << "BLE Bootstrap start: not implemented.";
 }
 
 void WifiBootstrapManager::EndBootstrapping() {
   LOG_IF(INFO, ble_setup_enabled_) << "BLE Bootstrap stop: not implemented.";
-  wifi_->DisableAccessPoint();
+  wifi_->StopAccessPoint();
   privet_ssid_.clear();
 }
 
@@ -99,11 +99,11 @@
       FROM_HERE, base::Bind(&WifiBootstrapManager::OnConnectError,
                             tasks_weak_factory_.GetWeakPtr(), nullptr),
       base::TimeDelta::FromMinutes(3));
-  wifi_->ConnectToService(ssid, passphrase,
-                          base::Bind(&WifiBootstrapManager::OnConnectSuccess,
-                                     tasks_weak_factory_.GetWeakPtr(), ssid),
-                          base::Bind(&WifiBootstrapManager::OnConnectError,
-                                     tasks_weak_factory_.GetWeakPtr()));
+  wifi_->Connect(ssid, passphrase,
+                 base::Bind(&WifiBootstrapManager::OnConnectSuccess,
+                            tasks_weak_factory_.GetWeakPtr(), ssid),
+                 base::Bind(&WifiBootstrapManager::OnConnectError,
+                            tasks_weak_factory_.GetWeakPtr()));
 }
 
 void WifiBootstrapManager::OnConnectError(const Error* error) {