Move screenlock_bridge to components/proximity_auth

chrome/browser/signin/easy_unlock_service_signin_chromeos.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_service_signin_chromeos.h"
 
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/stl_util.h"
 #include "base/sys_info.h"
 #include "base/thread_task_runner_handle.h"
 #include "base/time/time.h"
 #include "chrome/browser/chromeos/login/easy_unlock/easy_unlock_key_manager.h"
 #include "chrome/browser/chromeos/login/session/user_session_manager.h"
 #include "chrome/browser/signin/easy_unlock_app_manager.h"
 #include "chrome/browser/signin/easy_unlock_metrics.h"
+#include "chrome/browser/signin/easy_unlock_util.h"
 #include "chromeos/login/auth/user_context.h"
 #include "chromeos/tpm/tpm_token_loader.h"
 

[sdefresne, 2015/04/24 14:22:02]

#include "components/proximity_auth/screenlock_bridge.h"

[msarda, 2015/04/24 15:47:05]

Not needed - already included by its header 
chrome/browser/signin/easy_unlock_service_signin_chromeos.h

 namespace {
 
 // The maximum allowed backoff interval when waiting for cryptohome to start.
 uint32 kMaxCryptohomeBackoffIntervalMs = 10000u;
 
 // If the data load fails, the initial interval after which the load will be
 // retried. Further intervals will exponentially increas by factor 2.
 uint32 kInitialCryptohomeBackoffIntervalMs = 200u;
 
 // Calculates the backoff interval that should be used next.
@@ skipping 183 matching lines @@
   NOTREACHED();
 }
 
 void EasyUnlockServiceSignin::InitializeInternal() {
   if (chromeos::LoginState::Get()->IsUserLoggedIn())
     return;
 
   service_active_ = true;
 
   chromeos::LoginState::Get()->AddObserver(this);
-  ScreenlockBridge* screenlock_bridge = ScreenlockBridge::Get();
+  ScreenlockBridge* screenlock_bridge = GetScreenlockBridgeInstance();
   screenlock_bridge->AddObserver(this);
   if (!screenlock_bridge->focused_user_id().empty())
     OnFocusedUserChanged(screenlock_bridge->focused_user_id());
 }
 
 void EasyUnlockServiceSignin::ShutdownInternal() {
   if (!service_active_)
     return;
   service_active_ = false;
 
   weak_ptr_factory_.InvalidateWeakPtrs();
-  ScreenlockBridge::Get()->RemoveObserver(this);
+  GetScreenlockBridgeInstance()->RemoveObserver(this);
   chromeos::LoginState::Get()->RemoveObserver(this);
   STLDeleteContainerPairSecondPointers(user_data_.begin(), user_data_.end());
   user_data_.clear();
 }
 
 bool EasyUnlockServiceSignin::IsAllowedInternal() const {
   return service_active_ &&
          !user_id_.empty() &&
          !chromeos::LoginState::Get()->IsUserLoggedIn();
 }
@@ skipping 134 matching lines @@
     return NULL;
 
   std::map<std::string, UserData*>::const_iterator it =
       user_data_.find(user_id_);
   if (it == user_data_.end())
     return NULL;
   if (it->second->state != USER_DATA_STATE_LOADED)
     return NULL;
   return it->second;
 }