Move RemoteDevice from //components/proximity_auth to //components/cryptauth so that it can be easi…

components/proximity_auth/remote_device_loader_unittest.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "components/proximity_auth/remote_device_loader.h"
 
 #include <stddef.h>
 
 #include <memory>
 #include <utility>
@@ skipping 43 matching lines @@
 class ProximityAuthRemoteDeviceLoaderTest : public testing::Test {
  public:
   ProximityAuthRemoteDeviceLoaderTest()
       : secure_message_delegate_(new cryptauth::FakeSecureMessageDelegate()),
         user_private_key_(secure_message_delegate_->GetPrivateKeyForPublicKey(
             kUserPublicKey)),
         pref_manager_(new MockProximityAuthPrefManager()) {}
 
   ~ProximityAuthRemoteDeviceLoaderTest() {}
 
-  void OnRemoteDevicesLoaded(const std::vector<RemoteDevice>& remote_devices) {
+  void OnRemoteDevicesLoaded(
+      const std::vector<cryptauth::RemoteDevice>& remote_devices) {
     remote_devices_ = remote_devices;
     LoadCompleted();
   }
 
   MOCK_METHOD0(LoadCompleted, void());
 
  protected:
   // Handles deriving the PSK. Ownership will be passed to the
   // RemoteDeviceLoader under test.
   std::unique_ptr<cryptauth::FakeSecureMessageDelegate>
       secure_message_delegate_;
 
   // The private key of the user local device.
   std::string user_private_key_;
 
   // Stores the result of the RemoteDeviceLoader.
-  std::vector<RemoteDevice> remote_devices_;
+  std::vector<cryptauth::RemoteDevice> remote_devices_;
 
   // Stores the bluetooth address for BLE devices.
   std::unique_ptr<MockProximityAuthPrefManager> pref_manager_;
 
   DISALLOW_COPY_AND_ASSIGN(ProximityAuthRemoteDeviceLoaderTest);
 };
 
 TEST_F(ProximityAuthRemoteDeviceLoaderTest, LoadZeroDevices) {
   std::vector<cryptauth::ExternalDeviceInfo> unlock_keys;
   RemoteDeviceLoader loader(unlock_keys, user_private_key_, kUserId,
                             std::move(secure_message_delegate_),
                             pref_manager_.get());
 
-  std::vector<RemoteDevice> result;
+  std::vector<cryptauth::RemoteDevice> result;
   EXPECT_CALL(*this, LoadCompleted());
   loader.Load(
       base::Bind(&ProximityAuthRemoteDeviceLoaderTest::OnRemoteDevicesLoaded,
                  base::Unretained(this)));
 
   EXPECT_EQ(0u, remote_devices_.size());
 }
 
 TEST_F(ProximityAuthRemoteDeviceLoaderTest, LoadOneClassicRemoteDevice) {
   std::vector<cryptauth::ExternalDeviceInfo> unlock_keys(1,
                                                          CreateUnlockKey("1"));
   RemoteDeviceLoader loader(unlock_keys, user_private_key_, kUserId,
                             std::move(secure_message_delegate_),
                             pref_manager_.get());
 
-  std::vector<RemoteDevice> result;
+  std::vector<cryptauth::RemoteDevice> result;
   EXPECT_CALL(*this, LoadCompleted());
   loader.Load(
       base::Bind(&ProximityAuthRemoteDeviceLoaderTest::OnRemoteDevicesLoaded,
                  base::Unretained(this)));
 
   EXPECT_EQ(1u, remote_devices_.size());
   EXPECT_FALSE(remote_devices_[0].persistent_symmetric_key.empty());
   EXPECT_EQ(unlock_keys[0].friendly_device_name(), remote_devices_[0].name);
   EXPECT_EQ(unlock_keys[0].public_key(), remote_devices_[0].public_key);
   EXPECT_EQ(unlock_keys[0].bluetooth_address(),
             remote_devices_[0].bluetooth_address);
-  EXPECT_EQ(RemoteDevice::BLUETOOTH_CLASSIC, remote_devices_[0].bluetooth_type);
+  EXPECT_EQ(cryptauth::RemoteDevice::BLUETOOTH_CLASSIC,
+            remote_devices_[0].bluetooth_type);
 }
 
 TEST_F(ProximityAuthRemoteDeviceLoaderTest, LoadOneBLERemoteDevice) {
   std::vector<cryptauth::ExternalDeviceInfo> unlock_keys(1,
                                                          CreateUnlockKey("1"));
   unlock_keys[0].set_bluetooth_address(std::string());
   RemoteDeviceLoader loader(unlock_keys, user_private_key_, kUserId,
                             std::move(secure_message_delegate_),
                             pref_manager_.get());
 
   std::string ble_address = "00:00:00:00:00:00";
   EXPECT_CALL(*pref_manager_, GetDeviceAddress(testing::_))
       .WillOnce(testing::Return(ble_address));
 
-  std::vector<RemoteDevice> result;
+  std::vector<cryptauth::RemoteDevice> result;
   EXPECT_CALL(*this, LoadCompleted());
   loader.Load(
       base::Bind(&ProximityAuthRemoteDeviceLoaderTest::OnRemoteDevicesLoaded,
                  base::Unretained(this)));
 
   EXPECT_EQ(1u, remote_devices_.size());
   EXPECT_FALSE(remote_devices_[0].persistent_symmetric_key.empty());
   EXPECT_EQ(unlock_keys[0].friendly_device_name(), remote_devices_[0].name);
   EXPECT_EQ(unlock_keys[0].public_key(), remote_devices_[0].public_key);
   EXPECT_EQ(ble_address, remote_devices_[0].bluetooth_address);
-  EXPECT_EQ(RemoteDevice::BLUETOOTH_LE, remote_devices_[0].bluetooth_type);
+  EXPECT_EQ(cryptauth::RemoteDevice::BLUETOOTH_LE,
+            remote_devices_[0].bluetooth_type);
 }
 
 TEST_F(ProximityAuthRemoteDeviceLoaderTest, LoadThreeRemoteDevice) {
   std::vector<cryptauth::ExternalDeviceInfo> unlock_keys;
   unlock_keys.push_back(CreateUnlockKey("1"));
   unlock_keys.push_back(CreateUnlockKey("2"));
   unlock_keys.push_back(CreateUnlockKey("3"));
   RemoteDeviceLoader loader(unlock_keys, user_private_key_, kUserId,
                             std::move(secure_message_delegate_),
                             pref_manager_.get());
 
-  std::vector<RemoteDevice> result;
+  std::vector<cryptauth::RemoteDevice> result;
   EXPECT_CALL(*this, LoadCompleted());
   loader.Load(
       base::Bind(&ProximityAuthRemoteDeviceLoaderTest::OnRemoteDevicesLoaded,
                  base::Unretained(this)));
 
   EXPECT_EQ(3u, remote_devices_.size());
   for (size_t i = 0; i < 3; ++i) {
     EXPECT_FALSE(remote_devices_[i].persistent_symmetric_key.empty());
     EXPECT_EQ(unlock_keys[i].friendly_device_name(), remote_devices_[i].name);
     EXPECT_EQ(unlock_keys[i].public_key(), remote_devices_[i].public_key);
     EXPECT_EQ(unlock_keys[i].bluetooth_address(),
               remote_devices_[i].bluetooth_address);
   }
 }
 
 }  // namespace proximity_auth