Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(800)

Unified Diff: chrome/browser/chromeos/arc/auth/arc_active_directory_enrollment_token_fetcher_browsertest.cc

Issue 2704113003: Save Play user id when ARC user gets a Managed Google Play account (Closed)
Patch Set: Fix browsertest failure Created 3 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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..be75ae2b38b64d2104dd07e711b355b712a07574 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,8 +17,10 @@
#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 "chrome/test/base/testing_profile.h"
#include "chromeos/dbus/dbus_thread_manager.h"
#include "chromeos/dbus/fake_cryptohome_client.h"
#include "components/arc/arc_util.h"
@@ -111,7 +113,12 @@ class ArcActiveDirectoryEnrollmentTokenFetcherBrowserTest
new chromeos::FakeChromeUserManager());
const AccountId account_id(AccountId::AdFromObjGuid(kFakeGuid));
+ GetFakeUserManager()->AddUser(account_id);
GetFakeUserManager()->LoginUser(account_id);
+ chromeos::ProfileHelper::SetAlwaysReturnPrimaryUserForTesting(true);
+
+ chromeos::ProfileHelper::Get()->SetUserToProfileMappingForTesting(
+ GetFakeUserManager()->GetPrimaryUser(), new TestingProfile());
}
void StoreCorrectDmToken() {
@@ -143,6 +150,7 @@ class ArcActiveDirectoryEnrollmentTokenFetcherBrowserTest
void TearDownOnMainThread() override {
user_manager_enabler_.reset();
interceptor_.reset();
+ chromeos::ProfileHelper::SetAlwaysReturnPrimaryUserForTesting(false);
}
chromeos::FakeChromeUserManager* GetFakeUserManager() const {

Powered by Google App Engine
This is Rietveld 408576698