easy-unlock: Turn on by default.

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/easy_unlock/easy_unlock_metrics.h"
 #include "chrome/browser/chromeos/login/session/user_session_manager.h"
 #include "chromeos/login/auth/user_context.h"
 
 namespace {
 
 // The maximum allowed backoff interval when waiting for cryptohome to start.
@@ skipping 155 matching lines @@
   DCHECK_EQ(GetUserEmail(), user_id);
 
   chromeos::RecordEasyUnlockLoginEvent(success
                                            ? chromeos::EASY_SIGN_IN_SUCCESS
                                            : chromeos::EASY_SIGN_IN_FAILURE);
   DVLOG(1) << "Easy sign-in " << (success ? "success" : "failure");
 }
 
 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;
   if (!GetRemoteDevices() ||
       GetHardlockState() == EasyUnlockScreenlockStateHandler::NO_PAIRING) {
     event = chromeos::PASSWORD_SIGN_IN_NO_PAIRING;
   } else if (GetHardlockState() !=
              EasyUnlockScreenlockStateHandler::NO_HARDLOCK) {
     switch (GetHardlockState()) {
       case EasyUnlockScreenlockStateHandler::NO_HARDLOCK:
@@ skipping 119 matching lines @@
   LoadCurrentUserDataIfNeeded();
 }
 
 void EasyUnlockServiceSignin::LoggedInStateChanged() {
   if (!chromeos::LoginState::Get()->IsUserLoggedIn())
     return;
   UnloadApp();
 }
 
 void EasyUnlockServiceSignin::LoadCurrentUserDataIfNeeded() {
+  // TODO(xiyuan): Revisit this when adding tests.
+  if (!base::SysInfo::IsRunningOnChromeOS())
+    return;
+
   if (user_id_.empty() || !service_active_)
     return;
 
   std::map<std::string, UserData*>::iterator it = user_data_.find(user_id_);
   if (it == user_data_.end())
     user_data_.insert(std::make_pair(user_id_, new UserData()));
 
   UserData* data = user_data_[user_id_];
 
   if (data->state != USER_DATA_STATE_INITIAL)
@@ skipping 34 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;
 }