| Index: chrome/browser/chromeos/login/existing_user_controller.cc
|
| diff --git a/chrome/browser/chromeos/login/existing_user_controller.cc b/chrome/browser/chromeos/login/existing_user_controller.cc
|
| index e7d56876195f55dec908ab841af799852df970f9..8217396308c9f0589a577699fb8ad74970e88e3d 100644
|
| --- a/chrome/browser/chromeos/login/existing_user_controller.cc
|
| +++ b/chrome/browser/chromeos/login/existing_user_controller.cc
|
| @@ -179,8 +179,8 @@ void RecordPasswordChangeFlow(LoginPasswordChangeFlow flow) {
|
| }
|
|
|
| bool ShouldForceDircrypto() {
|
| - return base::CommandLine::ForCurrentProcess()->HasSwitch(
|
| - chromeos::switches::kEnableEncryptionMigration) &&
|
| + return !base::CommandLine::ForCurrentProcess()->HasSwitch(
|
| + chromeos::switches::kDisableEncryptionMigration) &&
|
| (arc::IsArcAvailable() || arc::IsArcKioskAvailable());
|
| }
|
|
|
|
|