Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(327)

Unified Diff: device/bluetooth/dbus/fake_bluetooth_le_advertising_manager_client.cc

Issue 2389393005: Revert of components/arc: implement multi advertising (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@plumb-incoming-connections
Patch Set: Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « device/bluetooth/dbus/fake_bluetooth_le_advertising_manager_client.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: device/bluetooth/dbus/fake_bluetooth_le_advertising_manager_client.cc
diff --git a/device/bluetooth/dbus/fake_bluetooth_le_advertising_manager_client.cc b/device/bluetooth/dbus/fake_bluetooth_le_advertising_manager_client.cc
index 6236ca78f0bac0ec3e93f013b209387a286b2f2a..c7fcf2594c04ab77ae914ec71480f5fcc6ccfc42 100644
--- a/device/bluetooth/dbus/fake_bluetooth_le_advertising_manager_client.cc
+++ b/device/bluetooth/dbus/fake_bluetooth_le_advertising_manager_client.cc
@@ -55,11 +55,11 @@
if (iter == service_provider_map_.end()) {
error_callback.Run(bluetooth_advertising_manager::kErrorInvalidArguments,
"Advertisement object not registered");
- } else if (currently_registered_.size() >= kMaxBluezAdvertisements) {
+ } else if (!currently_registered_.value().empty()) {
error_callback.Run(bluetooth_advertising_manager::kErrorFailed,
"Maximum advertisements reached");
} else {
- currently_registered_.push_back(advertisement_object_path);
+ currently_registered_ = advertisement_object_path;
base::ThreadTaskRunnerHandle::Get()->PostTask(FROM_HERE, callback);
}
}
@@ -76,19 +76,16 @@
return;
}
- auto service_iter = service_provider_map_.find(advertisement_object_path);
- auto reg_iter =
- std::find(currently_registered_.begin(), currently_registered_.end(),
- advertisement_object_path);
-
- if (service_iter == service_provider_map_.end()) {
+ ServiceProviderMap::iterator iter =
+ service_provider_map_.find(advertisement_object_path);
+ if (iter == service_provider_map_.end()) {
error_callback.Run(bluetooth_advertising_manager::kErrorDoesNotExist,
"Advertisement not registered");
- } else if (reg_iter == currently_registered_.end()) {
+ } else if (advertisement_object_path != currently_registered_) {
error_callback.Run(bluetooth_advertising_manager::kErrorDoesNotExist,
"Does not exist");
} else {
- currently_registered_.erase(reg_iter);
+ currently_registered_ = dbus::ObjectPath("");
base::ThreadTaskRunnerHandle::Get()->PostTask(FROM_HERE, callback);
}
}
« no previous file with comments | « device/bluetooth/dbus/fake_bluetooth_le_advertising_manager_client.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698