Replace SetAuthenticatedUsername with SetAuthenticatedAccountId.

chrome/browser/chromeos/file_manager/file_manager_browsertest.cc

 // Copyright (c) 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.
 
 // Browser test for basic Chrome OS file manager functionality:
 //  - The file list is updated when a file is added externally to the Downloads
 //    folder.
 //  - Selecting a file and copy-pasting it with the keyboard copies the file.
 //  - Selecting a file and pressing delete deletes it.
 
@@ skipping 1206 matching lines @@
 #endif
 WRAPPED_INSTANTIATE_TEST_CASE_P(
     MAYBE_ShowGridView,
     FileManagerBrowserTest,
     ::testing::Values(TestParameter(NOT_IN_GUEST_MODE, "showGridViewDownloads"),
                       TestParameter(IN_GUEST_MODE, "showGridViewDownloads"),
                       TestParameter(NOT_IN_GUEST_MODE, "showGridViewDrive")));
 
 // Structure to describe an account info.
 struct TestAccountInfo {
+  const char* const gaia_id;
   const char* const email;
   const char* const hash;
   const char* const display_name;
 };
 
 enum {
   DUMMY_ACCOUNT_INDEX = 0,
   PRIMARY_ACCOUNT_INDEX = 1,
   SECONDARY_ACCOUNT_INDEX_START = 2,
 };
 
 static const TestAccountInfo kTestAccounts[] = {
-  {"__dummy__@invalid.domain", "hashdummy", "Dummy Account"},
-  {"alice@invalid.domain", "hashalice", "Alice"},
-  {"bob@invalid.domain", "hashbob", "Bob"},
-  {"charlie@invalid.domain", "hashcharlie", "Charlie"},
+    {"gaia-id-d", "__dummy__@invalid.domain", "hashdummy", "Dummy Account"},
+    {"gaia-id-a", "alice@invalid.domain", "hashalice", "Alice"},
+    {"gaia-id-b", "bob@invalid.domain", "hashbob", "Bob"},
+    {"gaia-id-c", "charlie@invalid.domain", "hashcharlie", "Charlie"},
 };
 
 // Test fixture class for testing multi-profile features.
 class MultiProfileFileManagerBrowserTest : public FileManagerBrowserTestBase {
  protected:
   // Enables multi-profiles.
   void SetUpCommandLine(base::CommandLine* command_line) override {
     FileManagerBrowserTestBase::SetUpCommandLine(command_line);
     // Logs in to a dummy profile (For making MultiProfileWindowManager happy;
     // browser test creates a default window and the manager tries to assign a
@@ skipping 32 matching lines @@
 
   // Adds a new user for testing to the current session.
   void AddUser(const TestAccountInfo& info, bool log_in) {
     user_manager::UserManager* const user_manager =
         user_manager::UserManager::Get();
     if (log_in)
       user_manager->UserLoggedIn(info.email, info.hash, false);
     user_manager->SaveUserDisplayName(info.email,
                                       base::UTF8ToUTF16(info.display_name));
     SigninManagerFactory::GetForProfile(
-        chromeos::ProfileHelper::GetProfileByUserIdHash(info.hash))->
-            SetAuthenticatedUsername(info.email);
+        chromeos::ProfileHelper::GetProfileByUserIdHash(info.hash))
+        ->SetAuthenticatedAccountInfo(info.gaia_id, info.email);
   }
 
  private:
   GuestMode GetGuestModeParam() const override { return NOT_IN_GUEST_MODE; }
 
   const char* GetTestCaseNameParam() const override {
     return test_case_name_.c_str();
   }
 
   std::string test_case_name_;
@@ skipping 235 matching lines @@
   StartTest();
 }
 
 IN_PROC_BROWSER_TEST_F(VideoPlayerBrowserTest, OpenSingleVideoOnDrive) {
   set_test_case_name("openSingleVideoOnDrive");
   StartTest();
 }
 
 }  // namespace
 }  // namespace file_manager