We should use UserID object to identify users instead of username.

chrome/browser/signin/account_reconcilor_unittest.cc

 // Copyright 2013 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/command_line.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/run_loop.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/test/histogram_tester.h"
 #include "base/time/time.h"
@@ skipping 14 matching lines @@
 #include "chrome/test/base/testing_profile.h"
 #include "chrome/test/base/testing_profile_manager.h"
 #include "components/signin/core/browser/account_reconcilor.h"
 #include "components/signin/core/browser/account_tracker_service.h"
 #include "components/signin/core/browser/profile_oauth2_token_service.h"
 #include "components/signin/core/browser/signin_manager.h"
 #include "components/signin/core/browser/signin_metrics.h"
 #include "components/signin/core/browser/test_signin_client.h"
 #include "components/signin/core/common/profile_management_switches.h"
 #include "components/signin/core/common/signin_switches.h"
+#include "components/user_manager/user_id.h"
 #include "content/public/test/test_browser_thread_bundle.h"
 #include "google_apis/gaia/gaia_constants.h"
 #include "google_apis/gaia/gaia_urls.h"
 #include "net/url_request/test_url_fetcher_factory.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {
 
 class MockAccountReconcilor : public testing::StrictMock<AccountReconcilor> {
@@ skipping 51 matching lines @@
 
   void SetFakeResponse(const std::string& url,
                        const std::string& data,
                        net::HttpStatusCode code,
                        net::URLRequestStatus::Status status) {
     url_fetcher_factory_.SetFakeResponse(GURL(url), data, code, status);
   }
 
   MockAccountReconcilor* GetMockReconcilor();
 
-  std::string ConnectProfileToAccount(const std::string& gaia_id,
-                                      const std::string& username);
+  std::string ConnectProfileToAccount(const user_manager::UserID& user_id);
 
-  std::string PickAccountIdForAccount(const std::string& gaia_id,
-                                      const std::string& username);
+  std::string PickAccountIdForAccount(const user_manager::UserID& user_id);
 
   void SimulateAddAccountToCookieCompleted(
       GaiaCookieManagerService::Observer* observer,
-      const std::string& account_id,
+      const user_manager::UserID& user_id,
       const GoogleServiceAuthError& error);
 
   void SimulateCookieContentSettingsChanged(
       content_settings::Observer* observer,
       const ContentSettingsPattern& primary_pattern);
 
   GURL get_check_connection_info_url() {
     return get_check_connection_info_url_;
   }
 
@@ skipping 88 matching lines @@
   if (!mock_reconcilor_) {
     mock_reconcilor_ =
         static_cast<MockAccountReconcilor*>(
             AccountReconcilorFactory::GetForProfile(profile()));
   }
 
   return mock_reconcilor_;
 }
 
 std::string AccountReconcilorTest::ConnectProfileToAccount(
-    const std::string& gaia_id,
-    const std::string& username) {
-  const std::string account_id = PickAccountIdForAccount(gaia_id, username);
+    const user_manager::UserID& user_id) {
 #if !defined(OS_CHROMEOS)
   signin_manager()->set_password("password");
 #endif
-  signin_manager()->SetAuthenticatedAccountInfo(gaia_id, username);
-  token_service()->UpdateCredentials(account_id, "refresh_token");
+  signin_manager()->SetAuthenticatedAccountInfo(user_id);
+  token_service()->UpdateCredentials(user_id, "refresh_token");
   return account_id;
 }
 
-std::string AccountReconcilorTest::PickAccountIdForAccount(
-    const std::string& gaia_id,
-    const std::string& username) {
-  return account_tracker()->PickAccountIdForAccount(gaia_id, username);
+std::string AccountReconcilorTest::PickAccountIdForAccount(const user_manager::UserID& user_id) {
+  return account_tracker()->PickAccountIdForAccount(user_id);
 }
 
 void AccountReconcilorTest::SimulateAddAccountToCookieCompleted(
     GaiaCookieManagerService::Observer* observer,
     const std::string& account_id,
     const GoogleServiceAuthError& error) {
   observer->OnAddAccountToCookieCompleted(account_id, error);
 }
 
 void AccountReconcilorTest::SimulateCookieContentSettingsChanged(
@@ skipping 508 matching lines @@
   ASSERT_TRUE(reconcilor->is_reconcile_started_);
 
   SimulateAddAccountToCookieCompleted(reconcilor, account_id,
                                       GoogleServiceAuthError::AuthErrorNone());
   ASSERT_FALSE(reconcilor->is_reconcile_started_);
 }
 
 INSTANTIATE_TEST_CASE_P(AccountReconcilorMaybeEnabled,
                         AccountReconcilorTest,
                         testing::Bool());