Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4204)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/signin/easy_unlock_auth_attempt_unittest.cc

Issue 1096293003: Move screenlock_bridge to components/proximity_auth (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 5 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« chrome/browser/chromeos/login/screens/user_selection_screen.cc ('K') | « chrome/browser/signin/easy_unlock_auth_attempt.cc ('k') | chrome/browser/signin/easy_unlock_screenlock_state_handler.h » ('j') | chrome/browser/signin/easy_unlock_service_regular.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/signin/easy_unlock_auth_attempt_unittest.cc
diff --git a/chrome/browser/signin/easy_unlock_auth_attempt_unittest.cc b/chrome/browser/signin/easy_unlock_auth_attempt_unittest.cc
index 0cf2f87818758e217379e131a13536290c87d4da..8f7f8a24e303059d305cec14fe31f21785ecc629 100644
--- a/chrome/browser/signin/easy_unlock_auth_attempt_unittest.cc
+++ b/chrome/browser/signin/easy_unlock_auth_attempt_unittest.cc
@@ -5,8 +5,12 @@
#include "chrome/browser/signin/easy_unlock_auth_attempt.h"
#include "base/macros.h"
+#include "chrome/browser/profiles/profile.h"
Ilya Sherman 2015/04/24 21:22:01 nit: Not needed?
msarda 2015/04/27 11:29:24 Done.
#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 "chrome/browser/signin/signin_manager_factory.h"
Ilya Sherman 2015/04/24 21:22:01 nit: Not needed?
msarda 2015/04/27 11:29:24 Done.
+#include "components/proximity_auth/screenlock_bridge.h"
+#include "components/signin/core/browser/signin_manager_base.h"
Ilya Sherman 2015/04/24 21:22:01 nit: Not needed?
msarda 2015/04/27 11:29:24 Done.
#include "testing/gtest/include/gtest/gtest.h"
#if defined(OS_CHROMEOS)
@@ -100,7 +104,7 @@ class FakeAppManager : public EasyUnlockAppManager {
};
// Fake lock handler to be used in these tests.
-class TestLockHandler : public ScreenlockBridge::LockHandler {
+class TestLockHandler : public proximity_auth::ScreenlockBridge::LockHandler {
public:
// The state of unlock/signin procedure.
enum AuthState {
@@ -133,14 +137,15 @@ class TestLockHandler : public ScreenlockBridge::LockHandler {
// Not using |SetAuthType| to make sure it's not called during tests.
void set_auth_type(AuthType value) { auth_type_ = value; }
- // ScreenlockBridge::LockHandler implementation:
+ // proximity_auth::ScreenlockBridge::LockHandler implementation:
void ShowBannerMessage(const base::string16& message) override {
ADD_FAILURE() << "Should not be reached.";
}
void ShowUserPodCustomIcon(
const std::string& user_email,
- const ScreenlockBridge::UserPodCustomIconOptions& icon) override {
+ const proximity_auth::ScreenlockBridge::UserPodCustomIconOptions& icon)
+ override {
ADD_FAILURE() << "Should not be reached.";
}
@@ -215,7 +220,7 @@ class EasyUnlockAuthAttemptUnlockTest : public testing::Test {
}
void TearDown() override {
- ScreenlockBridge::Get()->SetLockHandler(NULL);
+ GetScreenlockBridgeInstance()->SetLockHandler(NULL);
auth_attempt_.reset();
}
@@ -223,7 +228,7 @@ class EasyUnlockAuthAttemptUnlockTest : public testing::Test {
void InitScreenLock() {
lock_handler_.reset(new TestLockHandler(kTestUser1));
lock_handler_->set_state(TestLockHandler::STATE_ATTEMPTING_UNLOCK);
- ScreenlockBridge::Get()->SetLockHandler(lock_handler_.get());
+ GetScreenlockBridgeInstance()->SetLockHandler(lock_handler_.get());
}
scoped_ptr<EasyUnlockAuthAttempt> auth_attempt_;
@@ -235,7 +240,7 @@ class EasyUnlockAuthAttemptUnlockTest : public testing::Test {
};
TEST_F(EasyUnlockAuthAttemptUnlockTest, StartWhenNotLocked) {
- ASSERT_FALSE(ScreenlockBridge::Get()->IsLocked());
+ ASSERT_FALSE(GetScreenlockBridgeInstance()->IsLocked());
EXPECT_FALSE(auth_attempt_->Start());
EXPECT_EQ(0u, app_manager_->auth_attempt_count());
@@ -243,10 +248,11 @@ TEST_F(EasyUnlockAuthAttemptUnlockTest, StartWhenNotLocked) {
TEST_F(EasyUnlockAuthAttemptUnlockTest, StartWhenAuthTypeIsPassword) {
InitScreenLock();
- ASSERT_TRUE(ScreenlockBridge::Get()->IsLocked());
+ ASSERT_TRUE(GetScreenlockBridgeInstance()->IsLocked());
ASSERT_EQ(TestLockHandler::STATE_ATTEMPTING_UNLOCK, lock_handler_->state());
- lock_handler_->set_auth_type(ScreenlockBridge::LockHandler::OFFLINE_PASSWORD);
+ lock_handler_->set_auth_type(
+ proximity_auth::ScreenlockBridge::LockHandler::OFFLINE_PASSWORD);
EXPECT_FALSE(auth_attempt_->Start());
@@ -257,7 +263,7 @@ TEST_F(EasyUnlockAuthAttemptUnlockTest, StartWhenAuthTypeIsPassword) {
TEST_F(EasyUnlockAuthAttemptUnlockTest,
StartWhenDispatchingAuthAttemptEventFails) {
InitScreenLock();
- ASSERT_TRUE(ScreenlockBridge::Get()->IsLocked());
+ ASSERT_TRUE(GetScreenlockBridgeInstance()->IsLocked());
ASSERT_EQ(TestLockHandler::STATE_ATTEMPTING_UNLOCK, lock_handler_->state());
app_manager_->set_auth_attempt_should_fail(true);
@@ -270,7 +276,7 @@ TEST_F(EasyUnlockAuthAttemptUnlockTest,
TEST_F(EasyUnlockAuthAttemptUnlockTest, ResetBeforeFinalizeUnlock) {
InitScreenLock();
- ASSERT_TRUE(ScreenlockBridge::Get()->IsLocked());
+ ASSERT_TRUE(GetScreenlockBridgeInstance()->IsLocked());
ASSERT_EQ(TestLockHandler::STATE_ATTEMPTING_UNLOCK, lock_handler_->state());
ASSERT_TRUE(auth_attempt_->Start());
@@ -285,7 +291,7 @@ TEST_F(EasyUnlockAuthAttemptUnlockTest, ResetBeforeFinalizeUnlock) {
TEST_F(EasyUnlockAuthAttemptUnlockTest, FinalizeUnlockFailure) {
InitScreenLock();
- ASSERT_TRUE(ScreenlockBridge::Get()->IsLocked());
+ ASSERT_TRUE(GetScreenlockBridgeInstance()->IsLocked());
ASSERT_EQ(TestLockHandler::STATE_ATTEMPTING_UNLOCK, lock_handler_->state());
ASSERT_TRUE(auth_attempt_->Start());
@@ -300,7 +306,7 @@ TEST_F(EasyUnlockAuthAttemptUnlockTest, FinalizeUnlockFailure) {
TEST_F(EasyUnlockAuthAttemptUnlockTest, FinalizeSigninCalled) {
InitScreenLock();
- ASSERT_TRUE(ScreenlockBridge::Get()->IsLocked());
+ ASSERT_TRUE(GetScreenlockBridgeInstance()->IsLocked());
ASSERT_EQ(TestLockHandler::STATE_ATTEMPTING_UNLOCK, lock_handler_->state());
ASSERT_TRUE(auth_attempt_->Start());
@@ -317,7 +323,7 @@ TEST_F(EasyUnlockAuthAttemptUnlockTest, FinalizeSigninCalled) {
TEST_F(EasyUnlockAuthAttemptUnlockTest, UnlockSucceeds) {
InitScreenLock();
- ASSERT_TRUE(ScreenlockBridge::Get()->IsLocked());
+ ASSERT_TRUE(GetScreenlockBridgeInstance()->IsLocked());
ASSERT_EQ(TestLockHandler::STATE_ATTEMPTING_UNLOCK, lock_handler_->state());
ASSERT_TRUE(auth_attempt_->Start());
@@ -332,7 +338,7 @@ TEST_F(EasyUnlockAuthAttemptUnlockTest, UnlockSucceeds) {
TEST_F(EasyUnlockAuthAttemptUnlockTest, FinalizeUnlockCalledForWrongUser) {
InitScreenLock();
- ASSERT_TRUE(ScreenlockBridge::Get()->IsLocked());
+ ASSERT_TRUE(GetScreenlockBridgeInstance()->IsLocked());
ASSERT_EQ(TestLockHandler::STATE_ATTEMPTING_UNLOCK, lock_handler_->state());
ASSERT_TRUE(auth_attempt_->Start());
@@ -367,7 +373,7 @@ class EasyUnlockAuthAttemptSigninTest : public testing::Test {
}
void TearDown() override {
- ScreenlockBridge::Get()->SetLockHandler(NULL);
+ GetScreenlockBridgeInstance()->SetLockHandler(NULL);
auth_attempt_.reset();
}
@@ -375,7 +381,7 @@ class EasyUnlockAuthAttemptSigninTest : public testing::Test {
void InitScreenLock() {
lock_handler_.reset(new TestLockHandler(kTestUser1));
lock_handler_->set_state(TestLockHandler::STATE_ATTEMPTING_SIGNIN);
- ScreenlockBridge::Get()->SetLockHandler(lock_handler_.get());
+ GetScreenlockBridgeInstance()->SetLockHandler(lock_handler_.get());
}
scoped_ptr<EasyUnlockAuthAttempt> auth_attempt_;
@@ -387,7 +393,7 @@ class EasyUnlockAuthAttemptSigninTest : public testing::Test {
};
TEST_F(EasyUnlockAuthAttemptSigninTest, StartWhenNotLocked) {
- ASSERT_FALSE(ScreenlockBridge::Get()->IsLocked());
+ ASSERT_FALSE(GetScreenlockBridgeInstance()->IsLocked());
EXPECT_FALSE(auth_attempt_->Start());
EXPECT_EQ(0u, app_manager_->auth_attempt_count());
@@ -395,10 +401,11 @@ TEST_F(EasyUnlockAuthAttemptSigninTest, StartWhenNotLocked) {
TEST_F(EasyUnlockAuthAttemptSigninTest, StartWhenAuthTypeIsPassword) {
InitScreenLock();
- ASSERT_TRUE(ScreenlockBridge::Get()->IsLocked());
+ ASSERT_TRUE(GetScreenlockBridgeInstance()->IsLocked());
ASSERT_EQ(TestLockHandler::STATE_ATTEMPTING_SIGNIN, lock_handler_->state());
- lock_handler_->set_auth_type(ScreenlockBridge::LockHandler::OFFLINE_PASSWORD);
+ lock_handler_->set_auth_type(
+ proximity_auth::ScreenlockBridge::LockHandler::OFFLINE_PASSWORD);
EXPECT_FALSE(auth_attempt_->Start());
@@ -409,7 +416,7 @@ TEST_F(EasyUnlockAuthAttemptSigninTest, StartWhenAuthTypeIsPassword) {
TEST_F(EasyUnlockAuthAttemptSigninTest,
StartWhenDispatchingAuthAttemptEventFails) {
InitScreenLock();
- ASSERT_TRUE(ScreenlockBridge::Get()->IsLocked());
+ ASSERT_TRUE(GetScreenlockBridgeInstance()->IsLocked());
ASSERT_EQ(TestLockHandler::STATE_ATTEMPTING_SIGNIN, lock_handler_->state());
app_manager_->set_auth_attempt_should_fail(true);
@@ -422,7 +429,7 @@ TEST_F(EasyUnlockAuthAttemptSigninTest,
TEST_F(EasyUnlockAuthAttemptSigninTest, ResetBeforeFinalizeSignin) {
InitScreenLock();
- ASSERT_TRUE(ScreenlockBridge::Get()->IsLocked());
+ ASSERT_TRUE(GetScreenlockBridgeInstance()->IsLocked());
ASSERT_EQ(TestLockHandler::STATE_ATTEMPTING_SIGNIN, lock_handler_->state());
ASSERT_TRUE(auth_attempt_->Start());
@@ -437,7 +444,7 @@ TEST_F(EasyUnlockAuthAttemptSigninTest, ResetBeforeFinalizeSignin) {
TEST_F(EasyUnlockAuthAttemptSigninTest, FinalizeSigninWithEmtpySecret) {
InitScreenLock();
- ASSERT_TRUE(ScreenlockBridge::Get()->IsLocked());
+ ASSERT_TRUE(GetScreenlockBridgeInstance()->IsLocked());
ASSERT_EQ(TestLockHandler::STATE_ATTEMPTING_SIGNIN, lock_handler_->state());
ASSERT_TRUE(auth_attempt_->Start());
@@ -452,7 +459,7 @@ TEST_F(EasyUnlockAuthAttemptSigninTest, FinalizeSigninWithEmtpySecret) {
TEST_F(EasyUnlockAuthAttemptSigninTest, FinalizeSigninWithEmtpyKey) {
InitScreenLock();
- ASSERT_TRUE(ScreenlockBridge::Get()->IsLocked());
+ ASSERT_TRUE(GetScreenlockBridgeInstance()->IsLocked());
ASSERT_EQ(TestLockHandler::STATE_ATTEMPTING_SIGNIN, lock_handler_->state());
ASSERT_TRUE(auth_attempt_->Start());
@@ -467,7 +474,7 @@ TEST_F(EasyUnlockAuthAttemptSigninTest, FinalizeSigninWithEmtpyKey) {
TEST_F(EasyUnlockAuthAttemptSigninTest, SigninSuccess) {
InitScreenLock();
- ASSERT_TRUE(ScreenlockBridge::Get()->IsLocked());
+ ASSERT_TRUE(GetScreenlockBridgeInstance()->IsLocked());
ASSERT_EQ(TestLockHandler::STATE_ATTEMPTING_SIGNIN, lock_handler_->state());
ASSERT_TRUE(auth_attempt_->Start());
@@ -484,7 +491,7 @@ TEST_F(EasyUnlockAuthAttemptSigninTest, SigninSuccess) {
TEST_F(EasyUnlockAuthAttemptSigninTest, WrongWrappedSecret) {
InitScreenLock();
- ASSERT_TRUE(ScreenlockBridge::Get()->IsLocked());
+ ASSERT_TRUE(GetScreenlockBridgeInstance()->IsLocked());
ASSERT_EQ(TestLockHandler::STATE_ATTEMPTING_SIGNIN, lock_handler_->state());
ASSERT_TRUE(auth_attempt_->Start());
@@ -499,7 +506,7 @@ TEST_F(EasyUnlockAuthAttemptSigninTest, WrongWrappedSecret) {
TEST_F(EasyUnlockAuthAttemptSigninTest, InvalidSessionKey) {
InitScreenLock();
- ASSERT_TRUE(ScreenlockBridge::Get()->IsLocked());
+ ASSERT_TRUE(GetScreenlockBridgeInstance()->IsLocked());
ASSERT_EQ(TestLockHandler::STATE_ATTEMPTING_SIGNIN, lock_handler_->state());
ASSERT_TRUE(auth_attempt_->Start());
@@ -514,7 +521,7 @@ TEST_F(EasyUnlockAuthAttemptSigninTest, InvalidSessionKey) {
TEST_F(EasyUnlockAuthAttemptSigninTest, FinalizeUnlockCalled) {
InitScreenLock();
- ASSERT_TRUE(ScreenlockBridge::Get()->IsLocked());
+ ASSERT_TRUE(GetScreenlockBridgeInstance()->IsLocked());
ASSERT_EQ(TestLockHandler::STATE_ATTEMPTING_SIGNIN, lock_handler_->state());
ASSERT_TRUE(auth_attempt_->Start());
@@ -529,7 +536,7 @@ TEST_F(EasyUnlockAuthAttemptSigninTest, FinalizeUnlockCalled) {
TEST_F(EasyUnlockAuthAttemptSigninTest, FinalizeSigninCalledForWrongUser) {
InitScreenLock();
- ASSERT_TRUE(ScreenlockBridge::Get()->IsLocked());
+ ASSERT_TRUE(GetScreenlockBridgeInstance()->IsLocked());
ASSERT_EQ(TestLockHandler::STATE_ATTEMPTING_SIGNIN, lock_handler_->state());
ASSERT_TRUE(auth_attempt_->Start());
« chrome/browser/chromeos/login/screens/user_selection_screen.cc ('K') | « chrome/browser/signin/easy_unlock_auth_attempt.cc ('k') | chrome/browser/signin/easy_unlock_screenlock_state_handler.h » ('j') | chrome/browser/signin/easy_unlock_service_regular.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698