Run RemoveArcData after a user has opted out

chrome/browser/chromeos/login/session/user_session_manager.cc

Index: chrome/browser/chromeos/login/session/user_session_manager.cc
diff --git a/chrome/browser/chromeos/login/session/user_session_manager.cc b/chrome/browser/chromeos/login/session/user_session_manager.cc
index c76775d19845f945ed45c15ead45300df56a6f1a..14f3472915611fc01e94ebaaff0e8962487e640f 100644
--- a/chrome/browser/chromeos/login/session/user_session_manager.cc
+++ b/chrome/browser/chromeos/login/session/user_session_manager.cc
@@ -96,6 +96,7 @@
 #include "chromeos/settings/cros_settings_names.h"
 #include "components/arc/arc_bridge_service.h"
 #include "components/arc/arc_service_manager.h"
+#include "components/arc/userdata/arc_user_data_service.h"
 #include "components/component_updater/component_updater_service.h"
 #include "components/flags_ui/pref_service_flags_storage.h"
 #include "components/policy/core/common/cloud/cloud_policy_constants.h"
@@ -1156,12 +1157,16 @@ void UserSessionManager::FinalizePrepareProfile(Profile* profile) {
 
     if (arc::ArcBridgeService::GetEnabled(
             base::CommandLine::ForCurrentProcess())) {
+      const AccountId& account_id =
+          multi_user_util::GetAccountIdFromProfile(profile);
       DCHECK(arc::ArcServiceManager::Get());
-      arc::ArcServiceManager::Get()->OnPrimaryUserProfilePrepared(
-          multi_user_util::GetAccountIdFromProfile(profile));
+      arc::ArcServiceManager::Get()->OnPrimaryUserProfilePrepared(account_id);

[Luis Héctor Chávez, 2016/05/17 16:11:55]

more or less in the same spirit of other comments in this review: would it be
possible to pass both the AccountId and the profile prefs here to avoid adding
arc::ArcUserDataService::Get()?

[dspaid, 2016/05/18 00:11:24]

Done.

       arc::ArcAuthService* arc_auth_service = arc::ArcAuthService::Get();
       DCHECK(arc_auth_service);
       arc_auth_service->OnPrimaryUserProfilePrepared(profile);
+      DCHECK(arc::ArcUserDataService::Get());
+      arc::ArcUserDataService::Get()->ClearIfDisabled(profile->GetPrefs(),
+                                                      account_id);
     }
   }