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

chrome/browser/chromeos/arc/auth/arc_active_directory_enrollment_token_fetcher_browsertest.cc

Index: chrome/browser/chromeos/arc/auth/arc_active_directory_enrollment_token_fetcher_browsertest.cc
diff --git a/chrome/browser/chromeos/arc/auth/arc_active_directory_enrollment_token_fetcher_browsertest.cc b/chrome/browser/chromeos/arc/auth/arc_active_directory_enrollment_token_fetcher_browsertest.cc
index ce952cf05e981767ced2a49fdac827349f0da0cf..d643cfda603fd55b8b4f1efc23ef714a82bba1cd 100644
--- a/chrome/browser/chromeos/arc/auth/arc_active_directory_enrollment_token_fetcher_browsertest.cc
+++ b/chrome/browser/chromeos/arc/auth/arc_active_directory_enrollment_token_fetcher_browsertest.cc
@@ -17,6 +17,7 @@
 #include "chrome/browser/chromeos/login/users/fake_chrome_user_manager.h"
 #include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h"
 #include "chrome/browser/chromeos/policy/dm_token_storage.h"
+#include "chrome/browser/chromeos/profiles/profile_helper.h"
 #include "chrome/browser/policy/cloud/test_request_interceptor.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
@@ -111,7 +112,9 @@ class ArcActiveDirectoryEnrollmentTokenFetcherBrowserTest
             new chromeos::FakeChromeUserManager());
 
     const AccountId account_id(AccountId::AdFromObjGuid(kFakeGuid));
+    GetFakeUserManager()->AddUser(account_id);
     GetFakeUserManager()->LoginUser(account_id);
+    chromeos::ProfileHelper::SetAlwaysReturnPrimaryUserForTesting(true);
   }
 
   void StoreCorrectDmToken() {
@@ -143,6 +146,7 @@ class ArcActiveDirectoryEnrollmentTokenFetcherBrowserTest
   void TearDownOnMainThread() override {
     user_manager_enabler_.reset();
     interceptor_.reset();
+    chromeos::ProfileHelper::SetAlwaysReturnPrimaryUserForTesting(false);
   }
 
   chromeos::FakeChromeUserManager* GetFakeUserManager() const {