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

components/proximity_auth/proximity_auth_system.cc

 // Copyright 2014 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/proximity_auth_system.h"
 
 #include "base/threading/thread_task_runner_handle.h"
 #include "components/proximity_auth/logging/logging.h"
 #include "components/proximity_auth/proximity_auth_client.h"
 #include "components/proximity_auth/remote_device_life_cycle_impl.h"
@@ skipping 38 matching lines @@
 void ProximityAuthSystem::Stop() {
   if (!started_)
     return;
   started_ = false;
   ScreenlockBridge::Get()->RemoveObserver(this);
   OnFocusedUserChanged(EmptyAccountId());
 }
 
 void ProximityAuthSystem::SetRemoteDevicesForUser(
     const AccountId& account_id,
-    const RemoteDeviceList& remote_devices) {
+    const cryptauth::RemoteDeviceList& remote_devices) {
   remote_devices_map_[account_id] = remote_devices;
   if (started_) {
     const AccountId& focused_account_id =
         ScreenlockBridge::Get()->focused_account_id();
     if (focused_account_id.is_valid())
       OnFocusedUserChanged(focused_account_id);
   }
 }
 
-RemoteDeviceList ProximityAuthSystem::GetRemoteDevicesForUser(
+cryptauth::RemoteDeviceList ProximityAuthSystem::GetRemoteDevicesForUser(
     const AccountId& account_id) const {
   if (remote_devices_map_.find(account_id) == remote_devices_map_.end())
-    return RemoteDeviceList();
+    return cryptauth::RemoteDeviceList();
   return remote_devices_map_.at(account_id);
 }
 
 void ProximityAuthSystem::OnAuthAttempted(const AccountId& /* account_id */) {
   // TODO(tengs): There is no reason to pass the |account_id| argument anymore.
   unlock_manager_->OnAuthAttempted(ScreenlockBridge::LockHandler::USER_CLICK);
 }
 
 void ProximityAuthSystem::OnSuspend() {
   PA_LOG(INFO) << "Preparing for device suspension.";
@@ skipping 63 matching lines @@
 
   if (remote_devices_map_.find(account_id) == remote_devices_map_.end() ||
       remote_devices_map_[account_id].size() == 0) {
     PA_LOG(INFO) << "User " << account_id.Serialize()
                  << " does not have a RemoteDevice.";
     return;
   }
 
   // TODO(tengs): We currently assume each user has only one RemoteDevice, so we
   // can simply take the first item in the list.
-  RemoteDevice remote_device = remote_devices_map_[account_id][0];
+  cryptauth::RemoteDevice remote_device = remote_devices_map_[account_id][0];
   if (!suspended_) {
     PA_LOG(INFO) << "Creating RemoteDeviceLifeCycle for focused user: "
                  << account_id.Serialize();
     remote_device_life_cycle_.reset(
         new RemoteDeviceLifeCycleImpl(remote_device, proximity_auth_client_));
     unlock_manager_->SetRemoteDeviceLifeCycle(remote_device_life_cycle_.get());
     remote_device_life_cycle_->AddObserver(this);
     remote_device_life_cycle_->Start();
   }
 }
 
 }  // proximity_auth