easy-unlock: Get rid of extra flag.

BUG=439638

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

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

chrome/app/generated_resources.grd

@@ -6583,13 +6583,7 @@ Keep your key file in a safe place. You will need it to create new versions of y
           Disable Smart Lock
         </message>
         <message name="IDS_FLAGS_DISABLE_EASY_UNLOCK_DESCRIPTION" desc="Description of the flag to disable Easy unlock.">
-          Do not use Smart Lock, which allows you to unlock your Chromebook when in proximity to your phone.
-        </message>
-        <message name="IDS_FLAGS_DISABLE_EASY_SIGNIN_NAME" desc="Name of the flag to disable Easy sign-in.">
-          Disable Smart Lock on sign-in screen.
-        </message>
-        <message name="IDS_FLAGS_DISABLE_EASY_SIGNIN_DESCRIPTION" desc="Description of the flag to disable Easy sign-in.">
-          Do not use Smart Lock on sign-in screen, which allows you to sign in to your Chromebook when in proximity to your phone.
+          Do not use Smart Lock, which allows you to unlock your Chromebook when in proximity to your phone. If you are the owner of the device, this also turns off Smart Lock on sign-in screen.
         </message>
       </if>
       <message name="IDS_FLAGS_DISABLE_NEW_BOOKMARK_APPS_NAME" desc="Name of the flag to disable the new bookmark app system.">

chrome/browser/about_flags.cc

@@ -834,13 +834,6 @@ const Experiment kExperiments[] = {
     kOsCrOS,
     SINGLE_VALUE_TYPE(proximity_auth::switches::kDisableEasyUnlock)
   },
-  {
-    "disable-easy-signin",
-    IDS_FLAGS_DISABLE_EASY_SIGNIN_NAME,
-    IDS_FLAGS_DISABLE_EASY_SIGNIN_DESCRIPTION,
-    kOsCrOSOwnerOnly,
-    SINGLE_VALUE_TYPE(proximity_auth::switches::kDisableEasySignin)
-  },
   {
     "enable-easy-unlock-proximity-detection",
     IDS_FLAGS_ENABLE_EASY_UNLOCK_PROXIMITY_DETECTION_NAME,

chrome/browser/signin/easy_unlock_service.cc

@@ -82,7 +82,7 @@ EasyUnlockService* EasyUnlockService::GetForUser(
 // static
 bool EasyUnlockService::IsSignInEnabled() {
   return !CommandLine::ForCurrentProcess()->HasSwitch(
-      proximity_auth::switches::kDisableEasySignin);
+      proximity_auth::switches::kDisableEasyUnlock);
 }
 
 class EasyUnlockService::BluetoothDetector

components/proximity_auth/switches.cc

@@ -11,9 +11,6 @@ namespace switches {
 // by CryptAuth.
 const char kCryptAuthHTTPHost[] = "cryptauth-http-host";
 
-// Disable Easy sign-in.
-const char kDisableEasySignin[] = "disable-easy-signin";
-
 // Disable Easy unlock.
 const char kDisableEasyUnlock[] = "disable-easy-unlock";
 

components/proximity_auth/switches.h

@@ -11,7 +11,6 @@ namespace switches {
 // All switches in alphabetical order. The switches should be documented
 // alongside the definition of their values in the .cc file.
 extern const char kCryptAuthHTTPHost[];
-extern const char kDisableEasySignin[];
 extern const char kDisableEasyUnlock[];
 extern const char kEnableProximityDetection[];
 extern const char kForceLoadEasyUnlockAppInTests[];