Remove workaround for to disable EasyUnlock in ephemeral mode for tests.

chrome/browser/signin/easy_unlock_service_regular.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_regular.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/prefs/pref_service.h"
 #include "base/prefs/scoped_user_pref_update.h"
@@ skipping 276 matching lines @@
   short_lived_user_context_.reset();
 #endif
 
   turn_off_flow_status_ = EasyUnlockService::IDLE;
   registrar_.RemoveAll();
   ScreenlockBridge::Get()->RemoveObserver(this);
 }
 
 bool EasyUnlockServiceRegular::IsAllowedInternal() const {
 #if defined(OS_CHROMEOS)
-  if (!user_manager::UserManager::Get()->IsLoggedInAsUserWithGaiaAccount())
+  user_manager::UserManager* user_manager = user_manager::UserManager::Get();
+  if (!user_manager->IsLoggedInAsUserWithGaiaAccount())
     return false;
 
   // TODO(tengs): Ephemeral accounts generate a new enrollment every time they
   // are added, so disable Smart Lock to reduce enrollments on server. However,
   // ephemeral accounts can be locked, so we should revisit this use case.
-  // TODO(tengs): Remove this special case and test this code path after test
-  // refactoring is landed (crbug.com/414829).
-  const user_manager::User* user =
-      chromeos::ProfileHelper::Get()->GetUserByProfile(profile());
-  user_manager::UserManager* user_manager = user_manager::UserManager::Get();
-  if (user->email() != chromeos::login::kStubUser &&
-      user_manager->IsCurrentUserNonCryptohomeDataEphemeral())
+  if (user_manager->IsCurrentUserNonCryptohomeDataEphemeral())
     return false;
 
   if (!chromeos::ProfileHelper::IsPrimaryProfile(profile()))
     return false;
 
   if (!profile()->GetPrefs()->GetBoolean(prefs::kEasyUnlockAllowed))
     return false;
 
   return true;
 #else
@@ skipping 73 matching lines @@
       new base::DictionaryValue());
   user_prefs_dict->SetBooleanWithoutPathExpansion(
       prefs::kEasyUnlockProximityRequired,
       profile_prefs->GetBoolean(prefs::kEasyUnlockProximityRequired));
 
   DictionaryPrefUpdate update(local_state,
                               prefs::kEasyUnlockLocalStateUserPrefs);
   std::string user_email = GetUserEmail();
   update->SetWithoutPathExpansion(user_email, user_prefs_dict.Pass());
 }