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

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

Issue 785663003: easy-unlock: Turn on by default. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix tests Created 6 years 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
« no previous file with comments | « chrome/browser/signin/easy_unlock_service_regular.cc ('k') | components/proximity_auth/switches.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/signin/easy_unlock_service_signin_chromeos.cc
diff --git a/chrome/browser/signin/easy_unlock_service_signin_chromeos.cc b/chrome/browser/signin/easy_unlock_service_signin_chromeos.cc
index 207f84a9da1d2e8f754503e768d3ac4d3624f4bc..4d6f53c95e27f1d57a75371c0ae98e2df14fe7f1 100644
--- a/chrome/browser/signin/easy_unlock_service_signin_chromeos.cc
+++ b/chrome/browser/signin/easy_unlock_service_signin_chromeos.cc
@@ -9,6 +9,7 @@
#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"
@@ -184,7 +185,9 @@ void EasyUnlockServiceSignin::RecordEasySignInOutcome(
void EasyUnlockServiceSignin::RecordPasswordLoginEvent(
const std::string& user_id) const {
- DCHECK_EQ(GetUserEmail(), user_id);
+ // This happens during tests where user could login without pod focusing.
+ if (GetUserEmail() != user_id)
+ return;
chromeos::EasyUnlockLoginEvent event =
chromeos::EASY_SIGN_IN_LOGIN_EVENT_COUNT;
@@ -324,6 +327,10 @@ void EasyUnlockServiceSignin::LoggedInStateChanged() {
}
void EasyUnlockServiceSignin::LoadCurrentUserDataIfNeeded() {
+ // TODO(xiyuan): Revisit this when adding tests.
+ if (!base::SysInfo::IsRunningOnChromeOS())
+ return;
+
if (user_id_.empty() || !service_active_)
return;
« no previous file with comments | « chrome/browser/signin/easy_unlock_service_regular.cc ('k') | components/proximity_auth/switches.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698