Save Play user id when ARC user gets a Managed Google Play account

chrome/browser/chromeos/arc/arc_session_manager.cc

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 8023b27d5bd373f80a783893a8262265d1e6fefd..a5863c56215a62f389574e292f12193282346b1f 100644
--- a/chrome/browser/chromeos/arc/arc_session_manager.cc
+++ b/chrome/browser/chromeos/arc/arc_session_manager.cc
@@ -108,6 +108,10 @@ void ArcSessionManager::RegisterProfilePrefs(
   // from a previous managed state to the unmanaged.
   registry->RegisterBooleanPref(prefs::kArcBackupRestoreEnabled, false);
   registry->RegisterBooleanPref(prefs::kArcLocationServiceEnabled, false);
+  // This is used to delete the Play user ID if ARC is disabled for an
+  // AD-managed device.
+  registry->RegisterStringPref(prefs::kArcActiveDirectoryPlayUserId,
+                               std::string());
 }
 
 // static
@@ -181,6 +185,11 @@ void ArcSessionManager::RemoveArcData() {
   }
 
   VLOG(1) << "Starting ARC data removal";
+
+  // Remove Play user ID for Active Directory managed devices.
+  profile_->GetPrefs()->SetString(prefs::kArcActiveDirectoryPlayUserId,
+                                  std::string());
+
   SetState(State::REMOVING_DATA_DIR);
   chromeos::DBusThreadManager::Get()->GetSessionManagerClient()->RemoveArcData(
       cryptohome::Identification(