Move screenlock_bridge to components/proximity_auth

chrome/browser/signin/easy_unlock_auth_attempt.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 "chrome/browser/signin/easy_unlock_auth_attempt.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "chrome/browser/signin/easy_unlock_app_manager.h"
-#include "chrome/browser/signin/screenlock_bridge.h"
+#include "chrome/browser/signin/easy_unlock_util.h"
+#include "components/proximity_auth/screenlock_bridge.h"
 #include "crypto/encryptor.h"
 #include "crypto/symmetric_key.h"
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/login/easy_unlock/easy_unlock_key_manager.h"
 #endif
 
 namespace {
 
 // Decrypts the secret that should be used to login from |wrapped_secret| using
@@ skipping 22 matching lines @@
 
   return secret;
 }
 
 void DefaultAuthAttemptFinalizedHandler(
     EasyUnlockAuthAttempt::Type auth_attempt_type,
     bool success,
     const std::string& user_id,
     const std::string& key_secret,
     const std::string& key_label) {
-  if (!ScreenlockBridge::Get()->IsLocked())
+  if (!GetScreenlockBridgeInstance()->IsLocked())
     return;
 
   switch (auth_attempt_type) {
     case EasyUnlockAuthAttempt::TYPE_UNLOCK:
       if (success) {
-        ScreenlockBridge::Get()->lock_handler()->Unlock(user_id);
+        GetScreenlockBridgeInstance()->lock_handler()->Unlock(user_id);
       } else {
-        ScreenlockBridge::Get()->lock_handler()->EnableInput();
+        GetScreenlockBridgeInstance()->lock_handler()->EnableInput();
       }
       return;
     case EasyUnlockAuthAttempt::TYPE_SIGNIN:
       if (success) {
-        ScreenlockBridge::Get()->lock_handler()->AttemptEasySignin(
+        GetScreenlockBridgeInstance()->lock_handler()->AttemptEasySignin(
             user_id, key_secret, key_label);
       } else {
         // Attempting signin with an empty secret is equivalent to canceling the
         // attempt.
-        ScreenlockBridge::Get()->lock_handler()->AttemptEasySignin(
+        GetScreenlockBridgeInstance()->lock_handler()->AttemptEasySignin(
             user_id, std::string(), std::string());
       }
       return;
   }
 }
 
 }  // namespace
 
 EasyUnlockAuthAttempt::EasyUnlockAuthAttempt(
     EasyUnlockAppManager* app_manager,
@@ skipping 10 matching lines @@
 }
 
 EasyUnlockAuthAttempt::~EasyUnlockAuthAttempt() {
   if (state_ == STATE_RUNNING)
     Cancel(user_id_);
 }
 
 bool EasyUnlockAuthAttempt::Start() {
   DCHECK_EQ(STATE_IDLE, state_);
 
-  if (!ScreenlockBridge::Get()->IsLocked())
+  if (!GetScreenlockBridgeInstance()->IsLocked())
     return false;
 
-  ScreenlockBridge::LockHandler::AuthType auth_type =
-      ScreenlockBridge::Get()->lock_handler()->GetAuthType(user_id_);
+  proximity_auth::ScreenlockBridge::LockHandler::AuthType auth_type =
+      GetScreenlockBridgeInstance()->lock_handler()->GetAuthType(user_id_);
 
-  if (auth_type != ScreenlockBridge::LockHandler::USER_CLICK) {
+  if (auth_type != proximity_auth::ScreenlockBridge::LockHandler::USER_CLICK) {
     Cancel(user_id_);
     return false;
   }
 
   state_ = STATE_RUNNING;
 
   if (!app_manager_->SendAuthAttemptEvent()) {
     Cancel(user_id_);
     return false;
   }
 
   return true;
 }
 
 void EasyUnlockAuthAttempt::FinalizeUnlock(const std::string& user_id,
                                            bool success) {
   if (state_ != STATE_RUNNING || user_id != user_id_)
     return;
 
-  if (!ScreenlockBridge::Get()->IsLocked())
+  if (!GetScreenlockBridgeInstance()->IsLocked())
     return;
 
   if (type_ != TYPE_UNLOCK) {
     Cancel(user_id_);
     return;
   }
 
   finalized_callback_.Run(type_, success, user_id, std::string(),
                           std::string());
   state_ = STATE_DONE;
 }
 
 void EasyUnlockAuthAttempt::FinalizeSignin(const std::string& user_id,
                                            const std::string& wrapped_secret,
                                            const std::string& raw_session_key) {
   if (state_ != STATE_RUNNING || user_id != user_id_)
     return;
 
-  if (!ScreenlockBridge::Get()->IsLocked())
+  if (!GetScreenlockBridgeInstance()->IsLocked())
     return;
 
   if (type_ != TYPE_SIGNIN) {
     Cancel(user_id_);
     return;
   }
 
   if (wrapped_secret.empty()) {
     Cancel(user_id_);
     return;
@@ skipping 12 matching lines @@
   state_ = STATE_DONE;
 }
 
 void EasyUnlockAuthAttempt::Cancel(const std::string& user_id) {
   state_ = STATE_DONE;
 
   const bool kFailure = false;
   finalized_callback_.Run(type_, kFailure, user_id, std::string(),
                           std::string());
 }