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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/policy/cloud/user_policy_signin_service_unittest.cc

Issue 964563002: Replace SetAuthenticatedUsername with SetAuthenticatedAccountId. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@priv
Patch Set: rebased Created 5 years, 8 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
« no previous file with comments | « chrome/browser/policy/cloud/component_cloud_policy_browsertest.cc ('k') | chrome/browser/prefs/chrome_pref_service_factory.cc » ('j') | chrome/browser/ui/webui/options/options_ui_browsertest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/policy/cloud/user_policy_signin_service_unittest.cc
diff --git a/chrome/browser/policy/cloud/user_policy_signin_service_unittest.cc b/chrome/browser/policy/cloud/user_policy_signin_service_unittest.cc
index 9bd390857d68ad98a1925e764dbeb9a7bf0c045f..4cc4e8ec5c43cbc0fb7f9b4704e8a889ea3f650c 100644
--- a/chrome/browser/policy/cloud/user_policy_signin_service_unittest.cc
+++ b/chrome/browser/policy/cloud/user_policy_signin_service_unittest.cc
@@ -33,6 +33,7 @@
#include "components/policy/core/common/cloud/mock_user_cloud_policy_store.h"
#include "components/policy/core/common/cloud/user_cloud_policy_manager.h"
#include "components/policy/core/common/schema_registry.h"
+#include "components/signin/core/browser/account_tracker_service.h"
#include "components/signin/core/browser/signin_manager.h"
#include "content/public/browser/browser_context.h"
#include "content/public/browser/notification_details.h"
@@ -65,6 +66,7 @@ namespace policy {
namespace {
+const char kTestGaiaId[] = "gaia-id-testuser@test.com";
const char kTestUser[] = "testuser@test.com";
#if !defined(OS_ANDROID)
@@ -134,8 +136,10 @@ class UserPolicySigninServiceTest : public testing::Test {
// a valid login token, while on other platforms, the login refresh token
// is specified directly.
#if defined(OS_ANDROID)
- GetTokenService()->IssueRefreshTokenForUser(kTestUser,
- "oauth2_login_refresh_token");
+ GetTokenService()->IssueRefreshTokenForUser(
+ AccountTrackerService::PickAccountIdForAccount(
+ profile_.get()->GetPrefs(), kTestGaiaId, kTestUser),
+ "oauth2_login_refresh_token");
#endif
service->RegisterForPolicy(
kTestUser,
@@ -390,7 +394,7 @@ class UserPolicySigninServiceSignedInTest : public UserPolicySigninServiceTest {
// Set the user as signed in.
SigninManagerFactory::GetForProfile(profile_.get())->
- SetAuthenticatedUsername(kTestUser);
+ SetAuthenticatedAccountInfo(kTestGaiaId, kTestUser);
// Let the SigninService know that the profile has been created.
content::NotificationService::current()->Notify(
@@ -425,8 +429,10 @@ TEST_F(UserPolicySigninServiceSignedInTest, InitWhileSignedIn) {
ASSERT_FALSE(IsRequestActive());
// Make oauth token available.
- GetTokenService()->IssueRefreshTokenForUser(kTestUser,
- "oauth_login_refresh_token");
+ GetTokenService()->IssueRefreshTokenForUser(
+ SigninManagerFactory::GetForProfile(profile_.get())
+ ->GetAuthenticatedAccountId(),
+ "oauth_login_refresh_token");
// Client registration should be in progress since we now have an oauth token.
EXPECT_EQ(mock_store_->signin_username_, kTestUser);
@@ -444,8 +450,10 @@ TEST_F(UserPolicySigninServiceSignedInTest, InitWhileSignedInOAuthError) {
ASSERT_FALSE(IsRequestActive());
// Make oauth token available.
- GetTokenService()->IssueRefreshTokenForUser(kTestUser,
- "oauth_login_refresh_token");
+ GetTokenService()->IssueRefreshTokenForUser(
+ SigninManagerFactory::GetForProfile(profile_.get())
+ ->GetAuthenticatedAccountId(),
+ "oauth_login_refresh_token");
// Client registration should be in progress since we now have an oauth token.
ASSERT_TRUE(IsRequestActive());
@@ -463,15 +471,17 @@ TEST_F(UserPolicySigninServiceTest, SignInAfterInit) {
ASSERT_FALSE(manager_->core()->service());
// Now sign in the user.
- SigninManagerFactory::GetForProfile(profile_.get())->SetAuthenticatedUsername(
- kTestUser);
+ SigninManagerFactory::GetForProfile(profile_.get())
+ ->SetAuthenticatedAccountInfo(kTestGaiaId, kTestUser);
// Complete initialization of the store.
mock_store_->NotifyStoreLoaded();
// Make oauth token available.
- GetTokenService()->IssueRefreshTokenForUser(kTestUser,
- "oauth_login_refresh_token");
+ GetTokenService()->IssueRefreshTokenForUser(
+ SigninManagerFactory::GetForProfile(profile_.get())
+ ->GetAuthenticatedAccountId(),
+ "oauth_login_refresh_token");
// UserCloudPolicyManager should be initialized.
EXPECT_EQ(mock_store_->signin_username_, kTestUser);
@@ -487,15 +497,18 @@ TEST_F(UserPolicySigninServiceTest, SignInWithNonEnterpriseUser) {
ASSERT_FALSE(manager_->core()->service());
// Now sign in a non-enterprise user (blacklisted gmail.com domain).
- SigninManagerFactory::GetForProfile(profile_.get())->SetAuthenticatedUsername(
- "non_enterprise_user@gmail.com");
+ SigninManagerFactory::GetForProfile(profile_.get())
+ ->SetAuthenticatedAccountInfo("gaia-id-non_enterprise_user@gmail.com",
+ "non_enterprise_user@gmail.com");
// Complete initialization of the store.
mock_store_->NotifyStoreLoaded();
// Make oauth token available.
- GetTokenService()->IssueRefreshTokenForUser(kTestUser,
- "oauth_login_refresh_token");
+ GetTokenService()->IssueRefreshTokenForUser(
+ SigninManagerFactory::GetForProfile(profile_.get())
+ ->GetAuthenticatedAccountId(),
+ "oauth_login_refresh_token");
// UserCloudPolicyManager should not be initialized and there should be no
// DMToken request active.
@@ -509,12 +522,14 @@ TEST_F(UserPolicySigninServiceTest, UnregisteredClient) {
ASSERT_FALSE(manager_->core()->service());
// Now sign in the user.
- SigninManagerFactory::GetForProfile(profile_.get())->SetAuthenticatedUsername(
- kTestUser);
+ SigninManagerFactory::GetForProfile(profile_.get())
+ ->SetAuthenticatedAccountInfo(kTestGaiaId, kTestUser);
// Make oauth token available.
- GetTokenService()->IssueRefreshTokenForUser(kTestUser,
- "oauth_login_refresh_token");
+ GetTokenService()->IssueRefreshTokenForUser(
+ SigninManagerFactory::GetForProfile(profile_.get())
+ ->GetAuthenticatedAccountId(),
+ "oauth_login_refresh_token");
// UserCloudPolicyManager should be initialized.
EXPECT_EQ(mock_store_->signin_username_, kTestUser);
@@ -537,12 +552,14 @@ TEST_F(UserPolicySigninServiceTest, RegisteredClient) {
ASSERT_FALSE(manager_->core()->service());
// Now sign in the user.
- SigninManagerFactory::GetForProfile(profile_.get())->SetAuthenticatedUsername(
- kTestUser);
+ SigninManagerFactory::GetForProfile(profile_.get())
+ ->SetAuthenticatedAccountInfo(kTestGaiaId, kTestUser);
// Make oauth token available.
- GetTokenService()->IssueRefreshTokenForUser(kTestUser,
- "oauth_login_refresh_token");
+ GetTokenService()->IssueRefreshTokenForUser(
+ SigninManagerFactory::GetForProfile(profile_.get())
+ ->GetAuthenticatedAccountId(),
+ "oauth_login_refresh_token");
// UserCloudPolicyManager should be initialized.
EXPECT_EQ(mock_store_->signin_username_, kTestUser);
« no previous file with comments | « chrome/browser/policy/cloud/component_cloud_policy_browsertest.cc ('k') | chrome/browser/prefs/chrome_pref_service_factory.cc » ('j') | chrome/browser/ui/webui/options/options_ui_browsertest.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698