Policy implementation for encryptfs to ext4 migration strategy

chrome/browser/chromeos/arc/arc_session_manager.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chromeos/arc/arc_session_manager.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/callback_helpers.h"
@@ skipping 613 matching lines @@
   // should be the only use case, and the |state_| should be limited to
   // STOPPED, then.
   // TODO(hidehiko): Think a way to get rid of 1), too.
 
   // Just remember the request in persistent data. The actual removal
   // is done via MaybeStartArcDataRemoval(). On completion (in
   // OnArcDataRemoved()), this flag should be reset.
   profile_->GetPrefs()->SetBoolean(prefs::kArcDataRemoveRequested, true);
 
   // To support 1) case above, maybe start data removal.
-  if (state_ == State::STOPPED && arc_session_runner_->IsStopped())
+  // The ArcAvailabilityPolicyStatus check is added 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 ArcAvailabilityPolicyStatus check after migration.
+  // crbug.com/725493
+  if (state_ == State::STOPPED && arc_session_runner_->IsStopped() &&
+      arc::GetArcAvailabilityPolicyStatus() !=

[hidehiko, 2017/05/25 12:41:55]

Setting kArcDataRemoveRequested pref needs to be guarded.
Otherwise, at sometime (e.g. on restarting), the data could be removed.

[igorcov, 2017/05/31 17:25:35]

Done.

+          arc::ARC_AVAILABILITY_POLICY_STATUS::DISABLED)
     MaybeStartArcDataRemoval();
 }
 
 void ArcSessionManager::MaybeStartTermsOfServiceNegotiation() {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
   DCHECK(profile_);
   DCHECK(!terms_of_service_negotiator_);
   // In Kiosk-mode, Terms of Service negotiation should be skipped.
   // See also RequestEnableImpl().
   DCHECK(!IsArcKioskMode());
@@ skipping 391 matching lines @@
 
 #undef MAP_STATE
 
   // Some compilers report an error even if all values of an enum-class are
   // covered exhaustively in a switch statement.
   NOTREACHED() << "Invalid value " << static_cast<int>(state);
   return os;
 }
 
 }  // namespace arc