Chromium Code Reviews| Index: chrome/browser/chromeos/arc/arc_session_manager.cc |
| diff --git a/chrome/browser/chromeos/arc/arc_session_manager.cc b/chrome/browser/chromeos/arc/arc_session_manager.cc |
| index f930bcc7a2b7e548aced3844aadf051f35673a10..7f9ca3dce8b17e3682ab78b5bf1e63fdf1adeb50 100644 |
| --- a/chrome/browser/chromeos/arc/arc_session_manager.cc |
| +++ b/chrome/browser/chromeos/arc/arc_session_manager.cc |
| @@ -630,6 +630,15 @@ void ArcSessionManager::RequestDisable() { |
| void ArcSessionManager::RequestArcDataRemoval() { |
| DCHECK_CURRENTLY_ON(content::BrowserThread::UI); |
| DCHECK(profile_); |
| + |
| + // The check if migration is allowed is done to make sure the data is not |
| + // removed if the device had ARC enabled and became disabled as result of |
| + // migration to ext4 policy. |
| + // TODO(igorcov): Remove this check after migration. crbug.com/725493 |
| + if (!arc::IsArcMigrationAllowed()) { |
|
hidehiko
2017/06/15 13:33:12
nit: Could you elide the brace for one-line if-sta
|
| + return; |
| + } |
| + |
| // TODO(hidehiko): DCHECK the previous state. This is called for four cases; |
| // 1) Supporting managed user initial disabled case (Please see also |
| // ArcPlayStoreEnabledPreferenceHandler::Start() for details). |