Replace SetAuthenticatedUsername with SetAuthenticatedAccountId.

chrome/browser/policy/cloud/user_policy_signin_service_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/files/file_path.h"
 #include "base/message_loop/message_loop.h"
 #include "base/message_loop/message_loop_proxy.h"
 #include "base/prefs/pref_service.h"
 #include "base/run_loop.h"
 #include "base/time/time.h"
@@ skipping 47 matching lines @@
 namespace em = enterprise_management;
 
 using testing::AnyNumber;
 using testing::Mock;
 using testing::_;
 
 namespace policy {
 
 namespace {
 
+const char kTestGaiaId[] = "12345";
 const char kTestUser[] = "testuser@test.com";
 
 #if !defined(OS_ANDROID)
 const char kValidTokenResponse[] =
     "{"
     "  \"access_token\": \"at1\","
     "  \"expires_in\": 3600,"
     "  \"token_type\": \"Bearer\""
     "}";
 #endif
@@ skipping 305 matching lines @@
 };
 
 class UserPolicySigninServiceSignedInTest : public UserPolicySigninServiceTest {
  public:
   void AddProfile() override {
     // UserCloudPolicyManager should not be initialized.
     ASSERT_FALSE(manager_->core()->service());
 
     // 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(
         chrome::NOTIFICATION_PROFILE_ADDED,
         content::Source<Profile>(profile_.get()),
         content::NotificationService::NoDetails());
   }
 };
 
 TEST_F(UserPolicySigninServiceTest, InitWhileSignedOut) {
@@ skipping 52 matching lines @@
   GetTokenService()->IssueErrorForAllPendingRequests(error);
   ASSERT_FALSE(IsRequestActive());
 }
 
 TEST_F(UserPolicySigninServiceTest, SignInAfterInit) {
   // UserCloudPolicyManager should not be initialized since there is no
   // signed-in user.
   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");
 
   // UserCloudPolicyManager should be initialized.
   EXPECT_EQ(mock_store_->signin_username_, kTestUser);
   ASSERT_TRUE(manager_->core()->service());
 
   // Client registration should be in progress since we have an oauth token.
   ASSERT_TRUE(IsRequestActive());
 }
 
 TEST_F(UserPolicySigninServiceTest, SignInWithNonEnterpriseUser) {
   // UserCloudPolicyManager should not be initialized since there is no
   // signed-in user.
   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("12345", "non_enterprise_user@gmail.com");

[Andrew T Wilson (Slow), 2015/04/13 14:32:53]

Why is this 12345 and not kTestGaiaId?

[Roger Tawa OOO till Jul 10th, 2015/04/13 15:44:56]

This call does not use kTestUser, so I figured it should not use kTestGaiaId. 
However, poor choice on my side to use the same actual value.  To be more
consistent with other code, I've formatted the gaia-id more explicitly.  Is that
OK?

 
   // Complete initialization of the store.
   mock_store_->NotifyStoreLoaded();
 
   // Make oauth token available.
   GetTokenService()->IssueRefreshTokenForUser(kTestUser,
                                               "oauth_login_refresh_token");
 
   // UserCloudPolicyManager should not be initialized and there should be no
   // DMToken request active.
   ASSERT_TRUE(!manager_->core()->service());
   ASSERT_FALSE(IsRequestActive());
 }
 
 TEST_F(UserPolicySigninServiceTest, UnregisteredClient) {
   // UserCloudPolicyManager should not be initialized since there is no
   // signed-in user.
   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");
 
   // UserCloudPolicyManager should be initialized.
   EXPECT_EQ(mock_store_->signin_username_, kTestUser);
   ASSERT_TRUE(manager_->core()->service());
 
   // Client registration should not be in progress since the store is not
   // yet initialized.
   ASSERT_FALSE(IsRequestActive());
 
   // Complete initialization of the store with no policy (unregistered client).
   mock_store_->NotifyStoreLoaded();
 
   // Client registration should be in progress since we have an oauth token.
   ASSERT_TRUE(IsRequestActive());
 }
 
 TEST_F(UserPolicySigninServiceTest, RegisteredClient) {
   // UserCloudPolicyManager should not be initialized since there is no
   // signed-in user.
   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");
 
   // UserCloudPolicyManager should be initialized.
   EXPECT_EQ(mock_store_->signin_username_, kTestUser);
   ASSERT_TRUE(manager_->core()->service());
 
   // Client registration should not be in progress since the store is not
@@ skipping 262 matching lines @@
   base::RunLoop().RunUntilIdle();
   EXPECT_FALSE(manager_->IsClientRegistered());
 #if !defined(OS_ANDROID)
   EXPECT_FALSE(signin_manager_->IsSignoutProhibited());
 #endif
 }
 
 }  // namespace
 
 }  // namespace policy