Commit d169c93d authored by Josh Nohle's avatar Josh Nohle Committed by Commit Bot

[DeviceSync v2] Replace queues with vectors in fakes

Replace request queues with vectors in FakeCryptAuthFeatureStatusSetter
and FakeCryptAuthDeviceNotifier for better element access during
testing.

Bug: 951969
Change-Id: I7292e3b3e1d0a4b814cab22b960e20945b4d4c4c
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1893495
Auto-Submit: Josh Nohle <nohle@chromium.org>
Commit-Queue: Kyle Horimoto <khorimoto@chromium.org>
Reviewed-by: default avatarKyle Horimoto <khorimoto@chromium.org>
Cr-Commit-Position: refs/heads/master@{#711335}
parent 89ad0cc6
......@@ -41,8 +41,9 @@ void FakeCryptAuthDeviceNotifier::NotifyDevices(
CryptAuthFeatureType feature_type,
base::OnceClosure success_callback,
base::OnceCallback<void(NetworkRequestError)> error_callback) {
requests_.emplace(device_ids, target_service, feature_type,
std::move(success_callback), std::move(error_callback));
requests_.emplace_back(device_ids, target_service, feature_type,
std::move(success_callback),
std::move(error_callback));
}
FakeCryptAuthDeviceNotifierFactory::FakeCryptAuthDeviceNotifierFactory() =
......
......@@ -7,10 +7,10 @@
#include <memory>
#include <string>
#include <vector>
#include "base/callback.h"
#include "base/containers/flat_set.h"
#include "base/containers/queue.h"
#include "base/macros.h"
#include "base/timer/timer.h"
#include "chromeos/services/device_sync/cryptauth_device_notifier.h"
......@@ -49,7 +49,7 @@ class FakeCryptAuthDeviceNotifier : public CryptAuthDeviceNotifier {
FakeCryptAuthDeviceNotifier();
~FakeCryptAuthDeviceNotifier() override;
base::queue<Request>& requests() { return requests_; }
std::vector<Request>& requests() { return requests_; }
private:
// CryptAuthDeviceNotifier:
......@@ -60,7 +60,7 @@ class FakeCryptAuthDeviceNotifier : public CryptAuthDeviceNotifier {
base::OnceClosure success_callback,
base::OnceCallback<void(NetworkRequestError)> error_callback) override;
base::queue<Request> requests_;
std::vector<Request> requests_;
DISALLOW_COPY_AND_ASSIGN(FakeCryptAuthDeviceNotifier);
};
......
......@@ -39,8 +39,9 @@ void FakeCryptAuthFeatureStatusSetter::SetFeatureStatus(
FeatureStatusChange status_change,
base::OnceClosure success_callback,
base::OnceCallback<void(NetworkRequestError)> error_callback) {
requests_.emplace(device_id, feature, status_change,
std::move(success_callback), std::move(error_callback));
requests_.emplace_back(device_id, feature, status_change,
std::move(success_callback),
std::move(error_callback));
}
FakeCryptAuthFeatureStatusSetterFactory::
......
......@@ -7,9 +7,9 @@
#include <memory>
#include <string>
#include <vector>
#include "base/callback.h"
#include "base/containers/queue.h"
#include "base/macros.h"
#include "base/timer/timer.h"
#include "chromeos/components/multidevice/software_feature.h"
......@@ -48,7 +48,7 @@ class FakeCryptAuthFeatureStatusSetter : public CryptAuthFeatureStatusSetter {
FakeCryptAuthFeatureStatusSetter();
~FakeCryptAuthFeatureStatusSetter() override;
base::queue<Request>& requests() { return requests_; }
std::vector<Request>& requests() { return requests_; }
private:
// CryptAuthFeatureStatusSetter:
......@@ -59,7 +59,7 @@ class FakeCryptAuthFeatureStatusSetter : public CryptAuthFeatureStatusSetter {
base::OnceClosure success_callback,
base::OnceCallback<void(NetworkRequestError)> error_callback) override;
base::queue<Request> requests_;
std::vector<Request> requests_;
DISALLOW_COPY_AND_ASSIGN(FakeCryptAuthFeatureStatusSetter);
};
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment