For some reason gerrit failed to update this bug.
https://chromium-review.googlesource.com/c/535500/ was merged.

The following revision refers to this bug:
  https://chromium.googlesource.com/chromiumos/platform2/+/204291e27fc98827eea6d8408bd3775785c90801

commit 204291e27fc98827eea6d8408bd3775785c90801
Author: Ryo Hashimoto <hashimoto@google.com>
Date: Thu Jun 22 10:34:52 2017

cryptohome: Add "cancelled" values to DircryptoMigrationEndStatus

BUG= chromium:733169 
TEST=build

Change-Id: I5ac8debc96c899ab3d7d87a099fec40a9cb402d4
Reviewed-on: https://chromium-review.googlesource.com/544636
Commit-Ready: Ryo Hashimoto <hashimoto@chromium.org>
Tested-by: Ryo Hashimoto <hashimoto@chromium.org>
Reviewed-by: Dan Spaid <dspaid@chromium.org>

[modify] https://crrev.com/204291e27fc98827eea6d8408bd3775785c90801/cryptohome/dircrypto_data_migrator/migration_helper.cc
[modify] https://crrev.com/204291e27fc98827eea6d8408bd3775785c90801/cryptohome/cryptohome_metrics.h

Requesting merge of https://chromium-review.googlesource.com/c/535500/ and https://chromium-review.googlesource.com/544636 to M60 branch.

This bug requires manual review: M60 has already been promoted to the beta branch, so this requires manual review
Please contact the milestone owner if you have questions.
Owners: amineer@(Android), cmasso@(iOS), josafat@(ChromeOS), bustamante@(Desktop)

For more details visit https://www.chromium.org/issue-tracking/autotriage - Your friendly Sheriffbot

The following revision refers to this bug:
  https://chromium.googlesource.com/chromiumos/platform2/+/e9996ea41eee2936b9ada3cf544d36ee65d38939

commit e9996ea41eee2936b9ada3cf544d36ee65d38939
Author: Ryo Hashimoto <hashimoto@google.com>
Date: Tue Jun 27 05:51:47 2017

cryptohome: Implement dircrypto migration cancellation

- Add AtomicFlag which is a dead copy of Chromium's.
- Implement MigrationHelper::Cancel
- Implement Mount::MaybeCancelActiveDircryptoMigrationAndWait(), and
call it from Mount::UnmountCryptohome().

BUG= chromium:733169 
TEST=cros_workon_make cryptohome --test
TEST=Run "restart ui" while migration is running

Change-Id: Iead7c00af21e09af4bf7f271c9f76c1d2369448e
Reviewed-on: https://chromium-review.googlesource.com/535500
Commit-Ready: Ryo Hashimoto <hashimoto@chromium.org>
Tested-by: Ryo Hashimoto <hashimoto@chromium.org>
Reviewed-by: Ryo Hashimoto <hashimoto@chromium.org>
(cherry picked from commit 1d600e2a5242c6daf7bc485558542726180194e2)
Reviewed-on: https://chromium-review.googlesource.com/549738
Commit-Queue: Ryo Hashimoto <hashimoto@chromium.org>
Trybot-Ready: Ryo Hashimoto <hashimoto@chromium.org>

[add] https://crrev.com/e9996ea41eee2936b9ada3cf544d36ee65d38939/cryptohome/dircrypto_data_migrator/atomic_flag.h
[add] https://crrev.com/e9996ea41eee2936b9ada3cf544d36ee65d38939/cryptohome/dircrypto_data_migrator/atomic_flag.cc
[modify] https://crrev.com/e9996ea41eee2936b9ada3cf544d36ee65d38939/cryptohome/mount.cc
[modify] https://crrev.com/e9996ea41eee2936b9ada3cf544d36ee65d38939/cryptohome/dircrypto_data_migrator/migration_helper.cc
[modify] https://crrev.com/e9996ea41eee2936b9ada3cf544d36ee65d38939/cryptohome/dircrypto_data_migrator/migration_helper.h
[modify] https://crrev.com/e9996ea41eee2936b9ada3cf544d36ee65d38939/cryptohome/mount.h
[modify] https://crrev.com/e9996ea41eee2936b9ada3cf544d36ee65d38939/cryptohome/cryptohome.gyp
[modify] https://crrev.com/e9996ea41eee2936b9ada3cf544d36ee65d38939/cryptohome/dircrypto_data_migrator/migration_helper_unittest.cc

The following revision refers to this bug:
  https://chromium.googlesource.com/chromiumos/platform2/+/e824bb022ca4aad9b59271a741571ca57a445fb5

commit e824bb022ca4aad9b59271a741571ca57a445fb5
Author: Ryo Hashimoto <hashimoto@google.com>
Date: Tue Jun 27 05:55:42 2017

cryptohome: Add "cancelled" values to DircryptoMigrationEndStatus

BUG= chromium:733169 
TEST=build

Change-Id: I5ac8debc96c899ab3d7d87a099fec40a9cb402d4
Reviewed-on: https://chromium-review.googlesource.com/544636
Commit-Ready: Ryo Hashimoto <hashimoto@chromium.org>
Tested-by: Ryo Hashimoto <hashimoto@chromium.org>
Reviewed-by: Dan Spaid <dspaid@chromium.org>
(cherry picked from commit 204291e27fc98827eea6d8408bd3775785c90801)
Reviewed-on: https://chromium-review.googlesource.com/549739
Reviewed-by: Ryo Hashimoto <hashimoto@chromium.org>
Commit-Queue: Ryo Hashimoto <hashimoto@chromium.org>

[modify] https://crrev.com/e824bb022ca4aad9b59271a741571ca57a445fb5/cryptohome/dircrypto_data_migrator/migration_helper.cc
[modify] https://crrev.com/e824bb022ca4aad9b59271a741571ca57a445fb5/cryptohome/cryptohome_metrics.h

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/9888d75c78ec81c6d402fe3ccb498165ecc79403

commit 9888d75c78ec81c6d402fe3ccb498165ecc79403
Author: dspaid <dspaid@chromium.org>
Date: Mon Jul 03 03:58:51 2017

Add new enum value for DircryptoMigrationEndStatus

Add an enum to indicate that the migration was cancelled (for example
because the source filesystem was unmounted).
BUG= 733169 
TEST=./validate_format.py && ./pretty_print.py

Review-Url: https://codereview.chromium.org/2965893002
Cr-Commit-Position: refs/heads/master@{#483937}

[modify] https://crrev.com/9888d75c78ec81c6d402fe3ccb498165ecc79403/tools/metrics/histograms/enums.xml