Replace SetAuthenticatedUsername with SetAuthenticatedAccountId.

chrome/browser/signin/signin_names_io_thread_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/message_loop/message_loop.h"
 #include "base/observer_list.h"
 #include "base/prefs/testing_pref_service.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/profiles/profile_info_cache.h"
+#include "chrome/browser/signin/account_tracker_service_factory.h"
 #include "chrome/browser/signin/fake_signin_manager.h"
 #include "chrome/browser/signin/signin_names_io_thread.h"
 #include "chrome/test/base/testing_browser_process.h"
 #include "chrome/test/base/testing_profile.h"
 #include "chrome/test/base/testing_profile_manager.h"
+#include "components/signin/core/browser/account_tracker_service.h"
 #include "components/signin/core/browser/signin_manager.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/test/test_browser_thread.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 class SigninNamesOnIOThreadTest : public testing::Test {
  public:
   SigninNamesOnIOThreadTest();
   void SetUp() override;
   void TearDown() override;
 
+  // Seed the account tracker with information from logged in user.  Normally
+  // this is done by UI code before calling SigninManager.  Returns the string
+  // to use as the account_id.
+  std::string AddToAccountTracker(const std::string& gaia_id,
+                                  const std::string& email);
   void SimulateSignin(const base::string16& email);
   void AddNewProfile(const base::string16& name, const base::string16& email);
 
   base::MessageLoop message_loop_;
   content::TestBrowserThread ui_thread_;
   content::TestBrowserThread io_thread_;
   scoped_ptr<TestingProfile> profile_;
   FakeSigninManager* signin_manager_;
   TestingProfileManager testing_profile_manager_;
   SigninNamesOnIOThread signin_names_;
@@ skipping 13 matching lines @@
                             FakeSigninManagerBase::Build);
   profile_ = builder.Build();
   signin_manager_ = static_cast<FakeSigninManager*>(
       SigninManagerFactory::GetForProfile(profile_.get()));
 }
 
 void SigninNamesOnIOThreadTest::TearDown() {
   signin_names_.ReleaseResourcesOnUIThread();
 }
 
+// Seed the account tracker with information from logged in user.  Normally
+// this is done by UI code before calling SigninManager.  Returns the string
+// to use as the account_id.
+std::string SigninNamesOnIOThreadTest::AddToAccountTracker(
+    const std::string& gaia_id,
+    const std::string& email) {
+  AccountTrackerService* service =
+      AccountTrackerServiceFactory::GetForProfile(profile_.get());
+  service->SeedAccountInfo(gaia_id, email);

[Mike Lerman, 2015/04/08 14:45:26]

Don't think this needs to be its own method (see signin_tracker_unittest), but
if it is, why not just return what SeedAccountInfo returns?

[Roger Tawa OOO till Jul 10th, 2015/04/08 20:24:20]

Done.

+  return service->PickAccountIdForAccount(gaia_id, email);
+}
+
 void SigninNamesOnIOThreadTest::SimulateSignin(const base::string16& email) {
-  signin_manager_->SignIn(base::UTF16ToUTF8(email), "password");
+  std::string email_str = base::UTF16ToUTF8(email);
+  AddToAccountTracker("gaia_id", email_str);

[Mike Lerman, 2015/04/08 14:45:26]

Similarly to signin_tracker_unittest. Why not just directly call
ATS->SeedAccountInfo?

[Roger Tawa OOO till Jul 10th, 2015/04/08 20:24:20]

Return value not used. Put code inline here since only called once.

+  signin_manager_->SignIn("gaia_id", email_str, "password");
 }
 
 void SigninNamesOnIOThreadTest::AddNewProfile(const base::string16& name,
                                               const base::string16& email) {
   ProfileInfoCache* cache = testing_profile_manager_.profile_info_cache();
   const base::FilePath& user_data_dir = cache->GetUserDataDir();
 #if defined(OS_POSIX)
   const base::FilePath profile_dir =
       user_data_dir.Append(base::UTF16ToUTF8(name));
 #else
@@ skipping 34 matching lines @@
 
   SigninNamesOnIOThread signin_names;
 
   const SigninNamesOnIOThread::EmailSet& emails = signin_names.GetEmails();
   ASSERT_EQ(2u, emails.size());
   ASSERT_EQ(1u, emails.count(email1));
   ASSERT_EQ(1u, emails.count(email2));
 
   signin_names.ReleaseResourcesOnUIThread();
 }