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

Unified Diff: components/cryptauth/remote_device.cc

Issue 2897843002: Revert of [EasyUnlock] Add beacon_seeds to RemoteDevice. (Closed)
Patch Set: Created 3 years, 7 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 | « components/cryptauth/remote_device.h ('k') | components/cryptauth/remote_device_loader.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/cryptauth/remote_device.cc
diff --git a/components/cryptauth/remote_device.cc b/components/cryptauth/remote_device.cc
index b9556956e57d9690c87916a73aa08a950f529e37..19665df742a95b4edba9531b4c92e17c59265e06 100644
--- a/components/cryptauth/remote_device.cc
+++ b/components/cryptauth/remote_device.cc
@@ -7,30 +7,6 @@
#include "base/base64.h"
namespace cryptauth {
-
-namespace {
-
-// Returns true if both vectors are BeaconSeeds are equal.
-bool AreBeaconSeedsEqual(const std::vector<BeaconSeed> beacon_seeds1,
- const std::vector<BeaconSeed> beacon_seeds2) {
- if (beacon_seeds1.size() != beacon_seeds2.size()) {
- return false;
- }
-
- for (size_t i = 0; i < beacon_seeds1.size(); ++i) {
- const BeaconSeed& seed1 = beacon_seeds1[i];
- const BeaconSeed& seed2 = beacon_seeds2[i];
- if (seed1.start_time_millis() != seed2.start_time_millis() ||
- seed1.end_time_millis() != seed2.end_time_millis() ||
- seed1.data() != seed2.data()) {
- return false;
- }
- }
-
- return true;
-}
-
-} // namespace
RemoteDevice::RemoteDevice() {}
@@ -51,12 +27,6 @@
RemoteDevice::~RemoteDevice() {}
-void RemoteDevice::LoadBeaconSeeds(
- const std::vector<BeaconSeed>& beacon_seeds) {
- this->are_beacon_seeds_loaded = true;
- this->beacon_seeds = beacon_seeds;
-}
-
std::string RemoteDevice::GetDeviceId() const {
std::string to_return;
base::Base64Encode(public_key, &to_return);
@@ -68,21 +38,12 @@
}
bool RemoteDevice::operator==(const RemoteDevice& other) const {
- // Only compare |beacon_seeds| if they are loaded.
- bool are_beacon_seeds_equal = false;
- if (are_beacon_seeds_loaded) {
- are_beacon_seeds_equal =
- other.are_beacon_seeds_loaded &&
- AreBeaconSeedsEqual(beacon_seeds, other.beacon_seeds);
- } else {
- are_beacon_seeds_equal = !other.are_beacon_seeds_loaded;
- }
-
- return user_id == other.user_id && name == other.name &&
- public_key == other.public_key &&
- bluetooth_address == other.bluetooth_address &&
- persistent_symmetric_key == other.persistent_symmetric_key &&
- sign_in_challenge == other.sign_in_challenge && are_beacon_seeds_equal;
+ return user_id == other.user_id
+ && name == other.name
+ && public_key == other.public_key
+ && bluetooth_address == other.bluetooth_address
+ && persistent_symmetric_key == other.persistent_symmetric_key
+ && sign_in_challenge == other.sign_in_challenge;
}
bool RemoteDevice::operator<(const RemoteDevice& other) const {
« no previous file with comments | « components/cryptauth/remote_device.h ('k') | components/cryptauth/remote_device_loader.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698