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

Unified Diff: components/proximity_auth/unlock_manager_unittest.cc

Issue 2561203002: Migrate weave-related classes from proximity_auth/ble to cryptauth/ble. (Closed)
Patch Set: Rebase. Created 4 years 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
Index: components/proximity_auth/unlock_manager_unittest.cc
diff --git a/components/proximity_auth/unlock_manager_unittest.cc b/components/proximity_auth/unlock_manager_unittest.cc
index cf6645f928abfdaaf0471c0f2d5d68d12d7b67cc..d5022656bdaef847fb866bd04041559c009d4eda 100644
--- a/components/proximity_auth/unlock_manager_unittest.cc
+++ b/components/proximity_auth/unlock_manager_unittest.cc
@@ -12,11 +12,11 @@
#include "base/test/test_simple_task_runner.h"
#include "base/threading/thread_task_runner_handle.h"
#include "build/build_config.h"
+#include "components/cryptauth/cryptauth_test_util.h"
#include "components/proximity_auth/fake_secure_context.h"
#include "components/proximity_auth/logging/logging.h"
#include "components/proximity_auth/messenger.h"
#include "components/proximity_auth/mock_proximity_auth_client.h"
-#include "components/proximity_auth/proximity_auth_test_util.h"
#include "components/proximity_auth/proximity_monitor.h"
#include "components/proximity_auth/remote_device_life_cycle.h"
#include "components/proximity_auth/remote_status_update.h"
@@ -160,7 +160,7 @@ class TestUnlockManager : public UnlockManager {
private:
std::unique_ptr<ProximityMonitor> CreateProximityMonitor(
const cryptauth::RemoteDevice& remote_device) override {
- EXPECT_EQ(kTestRemoteDevicePublicKey, remote_device.public_key);
+ EXPECT_EQ(cryptauth::kTestRemoteDevicePublicKey, remote_device.public_key);
std::unique_ptr<MockProximityMonitor> proximity_monitor(
new NiceMock<MockProximityMonitor>());
proximity_monitor_ = proximity_monitor.get();
@@ -188,7 +188,7 @@ CreateAndRegisterMockBluetoothAdapter() {
class ProximityAuthUnlockManagerTest : public testing::Test {
public:
ProximityAuthUnlockManagerTest()
- : remote_device_(CreateClassicRemoteDeviceForTest()),
+ : remote_device_(cryptauth::CreateClassicRemoteDeviceForTest()),
bluetooth_adapter_(CreateAndRegisterMockBluetoothAdapter()),
task_runner_(new base::TestSimpleTaskRunner()),
thread_task_runner_handle_(task_runner_) {

Powered by Google App Engine
This is Rietveld 408576698