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

components/proximity_auth/unlock_manager.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/unlock_manager.h"
 
 #include "base/bind.h"
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/memory/ptr_util.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "base/time/default_tick_clock.h"
 #include "base/time/time.h"
 #include "build/build_config.h"
+#include "components/cryptauth/remote_device.h"
 #include "components/proximity_auth/logging/logging.h"
 #include "components/proximity_auth/messenger.h"
 #include "components/proximity_auth/metrics.h"
 #include "components/proximity_auth/proximity_auth_client.h"
 #include "components/proximity_auth/proximity_monitor_impl.h"
-#include "components/proximity_auth/remote_device.h"
 #include "components/proximity_auth/secure_context.h"
 #include "device/bluetooth/bluetooth_adapter_factory.h"
 
 #if defined(OS_CHROMEOS)
 #include "chromeos/dbus/dbus_thread_manager.h"
 
 using chromeos::DBusThreadManager;
 #endif  // defined(OS_CHROMEOS)
 
 namespace proximity_auth {
@@ skipping 282 matching lines @@
       GetMessenger()->RequestUnlock();
     } else {
       PA_LOG(INFO) << "[Unlock] Protocol v3.1 not supported, skipping "
                    << "request_unlock.";
       GetMessenger()->DispatchUnlockEvent();
     }
   }
 }
 
 std::unique_ptr<ProximityMonitor> UnlockManager::CreateProximityMonitor(
-    const RemoteDevice& remote_device) {
+    const cryptauth::RemoteDevice& remote_device) {
   return base::MakeUnique<ProximityMonitorImpl>(
       remote_device, base::WrapUnique(new base::DefaultTickClock()));
 }
 
 void UnlockManager::SendSignInChallenge() {
   if (!life_cycle_ || !GetMessenger() || !GetMessenger()->GetSecureContext()) {
     PA_LOG(ERROR) << "Not ready to send sign-in challenge";
     return;
   }
 
-  RemoteDevice remote_device = life_cycle_->GetRemoteDevice();
+  cryptauth::RemoteDevice remote_device = life_cycle_->GetRemoteDevice();
   proximity_auth_client_->GetChallengeForUserAndDevice(
       remote_device.user_id, remote_device.public_key,
       GetMessenger()->GetSecureContext()->GetChannelBindingData(),
       base::Bind(&UnlockManager::OnGotSignInChallenge,
                  weak_ptr_factory_.GetWeakPtr()));
 }
 
 void UnlockManager::OnGotSignInChallenge(const std::string& challenge) {
   PA_LOG(INFO) << "Got sign-in challenge, sending for decryption...";
   GetMessenger()->RequestDecryption(challenge);
@@ skipping 149 matching lines @@
 
 Messenger* UnlockManager::GetMessenger() {
   // TODO(tengs): We should use a weak pointer to hold the Messenger instance
   // instead.
   if (!life_cycle_)
     return nullptr;
   return life_cycle_->GetMessenger();
 }
 
 }  // namespace proximity_auth