easy-signin: Flip enable flag to disable.

BUG=419013

Review URL: https://codereview.chromium.org/621503002

Cr-Commit-Position: refs/heads/master@{#297596}

7 files changed, 31 insertions, 19 deletions

diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index 6e9873c..aa67dac 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -6423,11 +6423,11 @@ Keep your key file in a safe place. You will need it to create new versions of y
         <message name="IDS_FLAGS_ENABLE_FIRST_RUN_UI_TRANSITIONS_DESCRIPTION" desc="Description for the flag to enable animated transition in the first-run tutorial.">
           If enabled, transitions during first-run tutorial are animated.
         </message>
-        <message name="IDS_FLAGS_ENABLE_EASY_SIGNIN_NAME" desc="Name of the Enable Easy signin flag.">
-          Enable Easy sign-in
+        <message name="IDS_FLAGS_DISABLE_EASY_SIGNIN_NAME" desc="Name of the disable Easy signin flag.">
+          Disable Easy sign-in
         </message>
-        <message name="IDS_FLAGS_ENABLE_EASY_SIGNIN_DESCRIPTION" desc="Description of the Enable Easy signin flag.">
-          Easy sign-in allows you to sign in your Chromebook when in proximity to your phone.
+        <message name="IDS_FLAGS_DISABLE_EASY_SIGNIN_DESCRIPTION" desc="Description of the Enable Easy signin flag.">
+          Do not use Easy sign-in, which allows you to sign in your Chromebook when in proximity to your phone.
         </message>
       </if>
       <message name="IDS_FLAGS_ENABLE_STREAMLINED_HOSTED_APPS_NAME" desc="Name of the flag to enable streamlined hosted apps.">
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
index 03fa029..c3db41a 100644
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -926,11 +926,11 @@ const Experiment kExperiments[] = {
     SINGLE_VALUE_TYPE(chromeos::switches::kEnableTouchpadThreeFingerClick)
   },
   {
-    "enable-easy-signin",
-    IDS_FLAGS_ENABLE_EASY_SIGNIN_NAME,
-    IDS_FLAGS_ENABLE_EASY_SIGNIN_DESCRIPTION,
+    "disable-easy-signin",
+    IDS_FLAGS_DISABLE_EASY_SIGNIN_NAME,
+    IDS_FLAGS_DISABLE_EASY_SIGNIN_DESCRIPTION,
     kOsCrOSOwnerOnly,
-    SINGLE_VALUE_TYPE(chromeos::switches::kEnableEasySignin),
+    SINGLE_VALUE_TYPE(chromeos::switches::kDisableEasySignin),
   },
 #endif
 #if defined(USE_ASH)
diff --git a/chrome/browser/chromeos/login/session/user_session_manager.cc b/chrome/browser/chromeos/login/session/user_session_manager.cc
index e09d9c9..664b869 100644
--- a/chrome/browser/chromeos/login/session/user_session_manager.cc
+++ b/chrome/browser/chromeos/login/session/user_session_manager.cc
@@ -451,8 +451,8 @@ bool UserSessionManager::RespectLocalePreference(
 }
 
 bool UserSessionManager::NeedsToUpdateEasyUnlockKeys() const {
-  return CommandLine::ForCurrentProcess()->HasSwitch(
-             chromeos::switches::kEnableEasySignin) &&
+  return !CommandLine::ForCurrentProcess()->HasSwitch(
+             chromeos::switches::kDisableEasySignin) &&
          !user_context_.GetUserID().empty() &&
          user_context_.GetUserType() == user_manager::USER_TYPE_REGULAR &&
          user_context_.GetKey() && !user_context_.GetKey()->GetSecret().empty();
@@ -1030,11 +1030,22 @@ void UserSessionManager::NotifyPendingUserSessionsRestoreFinished() {
 }
 
 void UserSessionManager::UpdateEasyUnlockKeys(Profile* user_profile) {
+  // Skip key update because FakeCryptohomeClient always return success
+  // and RemoveKey op expects a failure to stop. As a result, some tests would
+  // timeout.
+  // TODO(xiyuan): Revisit this when adding tests.
+  if (!base::SysInfo::IsRunningOnChromeOS())
+    return;
+
   if (!GetEasyUnlockKeyManager())
     return;
 
   // Only update Easy unlock keys for regular user.
-  if (user_context_.GetUserType() != user_manager::USER_TYPE_REGULAR)
+  // TODO(xiyuan): Fix inconsistency user type of |user_context_| introduced in
+  // authenticator.
+  user_manager::User* active_user =
+      user_manager::UserManager::Get()->GetActiveUser();
+  if (active_user->GetType() != user_manager::USER_TYPE_REGULAR)
     return;
 
   // Bail if |user_context_| does not have secret.
@@ -1101,8 +1112,8 @@ UserSessionManager::GetDefaultIMEState(Profile* profile) {
 }
 
 EasyUnlockKeyManager* UserSessionManager::GetEasyUnlockKeyManager() {
-  if (!CommandLine::ForCurrentProcess()
-           ->HasSwitch(chromeos::switches::kEnableEasySignin)) {
+  if (CommandLine::ForCurrentProcess()
+           ->HasSwitch(chromeos::switches::kDisableEasySignin)) {
     return NULL;
   }
 
diff --git a/chrome/browser/signin/easy_unlock_service_factory.cc b/chrome/browser/signin/easy_unlock_service_factory.cc
index cb981ee..fc02047 100644
--- a/chrome/browser/signin/easy_unlock_service_factory.cc
+++ b/chrome/browser/signin/easy_unlock_service_factory.cc
@@ -48,8 +48,8 @@ KeyedService* EasyUnlockServiceFactory::BuildServiceInstanceFor(
 #if defined(OS_CHROMEOS)
   if (chromeos::ProfileHelper::IsSigninProfile(
           Profile::FromBrowserContext(context))) {
-    if (CommandLine::ForCurrentProcess()->HasSwitch(
-            chromeos::switches::kEnableEasySignin)) {
+    if (!CommandLine::ForCurrentProcess()->HasSwitch(
+            chromeos::switches::kDisableEasySignin)) {
       return new EasyUnlockServiceSignin(Profile::FromBrowserContext(context));
     } else {
       return NULL;
diff --git a/chromeos/chromeos_switches.cc b/chromeos/chromeos_switches.cc
index 9366dbd..26a8d20 100644
--- a/chromeos/chromeos_switches.cc
+++ b/chromeos/chromeos_switches.cc
@@ -37,6 +37,9 @@ const char kDisableBootAnimation[] = "disable-boot-animation";
 // Disables the ChromeOS demo.
 const char kDisableDemoMode[] = "disable-demo-mode";
 
+// Disable Easy sign-in.
+const char kDisableEasySignin[] = "disable-easy-signin";
+
 // Disable HID-detection OOBE screen.
 const char kDisableHIDDetectionOnOOBE[] = "disable-hid-detection-on-oobe";
 
@@ -76,9 +79,6 @@ const char kEnableChromeVoxNext[] = "enable-chromevox-next";
 // locate the device.
 const char kEnableConsumerManagement[] = "enable-consumer-management";
 
-// Enable Easy sign-in.
-const char kEnableEasySignin[] = "enable-easy-signin";
-
 // If this switch is set, Chrome OS login screen uses |EmbeddedSignin| endpoint
 // of GAIA.
 const char kEnableEmbeddedSignin[] = "enable-embedded-signin";
diff --git a/chromeos/chromeos_switches.h b/chromeos/chromeos_switches.h
index e67a10c..43b66b9 100644
--- a/chromeos/chromeos_switches.h
+++ b/chromeos/chromeos_switches.h
@@ -29,6 +29,7 @@ CHROMEOS_EXPORT extern const char kDerelictDetectionTimeout[];
 CHROMEOS_EXPORT extern const char kDerelictIdleTimeout[];
 CHROMEOS_EXPORT extern const char kDisableBootAnimation[];
 CHROMEOS_EXPORT extern const char kDisableDemoMode[];
+CHROMEOS_EXPORT extern const char kDisableEasySignin[];
 CHROMEOS_EXPORT extern const char kDisableGaiaServices[];
 CHROMEOS_EXPORT extern const char kDisableHIDDetectionOnOOBE[];
 CHROMEOS_EXPORT extern const char kDisableLoginAnimations[];
@@ -42,7 +43,6 @@ CHROMEOS_EXPORT extern const char kEnableCarrierSwitching[];
 CHROMEOS_EXPORT extern const char kEnableChromeVoxNext[];
 CHROMEOS_EXPORT extern const char kEnableConsumerManagement[];
 CHROMEOS_EXPORT extern const char kEnableEmbeddedSignin[];
-CHROMEOS_EXPORT extern const char kEnableEasySignin[];
 CHROMEOS_EXPORT extern const char kEnableExtensionAssetsSharing[];
 CHROMEOS_EXPORT extern const char kEnableFirstRunUITransitions[];
 CHROMEOS_EXPORT extern const char kEnableKioskMode[];
diff --git a/tools/metrics/histograms/histograms.xml b/tools/metrics/histograms/histograms.xml
index 777b0e69..d65f0d3 100644
--- a/tools/metrics/histograms/histograms.xml
+++ b/tools/metrics/histograms/histograms.xml
@@ -45599,6 +45599,7 @@ To add a new entry, add it with any value and run test to compute valid value.
       label="disable-gesture-requirement-for-media-playback"/>
   <int value="458410433" label="disable-views-rect-based-targeting"/>
   <int value="494733611" label="disable-drop-sync-credential"/>
+  <int value="546710806" label="disable-easy-signin"/>
   <int value="550378029" label="reset-app-list-install-state"/>
   <int value="567368307" label="enable-experimental-canvas-features"/>
   <int value="593707592" label="disable-network-portal-notification"/>