Add gaia_id to ProfileInfoCache.

chrome/browser/profiles/profile_list_desktop_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 "chrome/browser/profiles/profile_list_desktop.h"
 
 #include <string>
 
 #include "base/command_line.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 59 matching lines @@
     EXPECT_EQ(0, change_count());
     return avatar_menu_.get();
   }
 
   TestingProfileManager* manager() { return &manager_; }
 
   void AddOmittedProfile(std::string name) {
     ProfileInfoCache* cache = manager()->profile_info_cache();
     cache->AddProfileToCache(
         cache->GetUserDataDir().AppendASCII(name), ASCIIToUTF16(name),
-        base::string16(), 0, "TEST_ID");
+        std::string(), base::string16(), 0, "TEST_ID");
   }
 
   int change_count() const { return mock_observer_->change_count(); }
 
  private:
   TestingProfileManager manager_;
   scoped_ptr<MockObserver> mock_observer_;
   scoped_ptr<AvatarMenu> avatar_menu_;
   content::TestBrowserThreadBundle thread_bundle_;
 
@@ skipping 240 matching lines @@
 TEST_F(ProfileListDesktopTest, SyncState) {
   // If multiprofile mode is not enabled then the menu is never shown.
   if (!profiles::IsMultipleProfilesEnabled())
     return;
 
   manager()->CreateTestingProfile("Test 1");
 
   // Add a managed user profile.
   ProfileInfoCache* cache = manager()->profile_info_cache();
   base::FilePath path = cache->GetUserDataDir().AppendASCII("p2");
-  cache->AddProfileToCache(path, ASCIIToUTF16("Test 2"), base::string16(), 0,
-                           "TEST_ID");
+  cache->AddProfileToCache(path, ASCIIToUTF16("Test 2"), std::string(),
+                           base::string16(), 0, "TEST_ID");
   cache->SetIsOmittedProfileAtIndex(cache->GetIndexOfProfileWithPath(path),
                                     false);
 
   AvatarMenu* model = GetAvatarMenu();
   model->RebuildMenu();
   EXPECT_EQ(2U, model->GetNumberOfItems());
 
-  // Now check that the sync_state of a supervised user shows the supervised
+  // Now check that the username of a supervised user shows the supervised
   // user avatar label instead.
   base::string16 supervised_user_label =
       l10n_util::GetStringUTF16(IDS_SUPERVISED_USER_AVATAR_LABEL);
   const AvatarMenu::Item& item1 = model->GetItemAt(0);
-  EXPECT_NE(item1.sync_state, supervised_user_label);
+  EXPECT_NE(item1.username, supervised_user_label);
 
   const AvatarMenu::Item& item2 = model->GetItemAt(1);
-  EXPECT_EQ(item2.sync_state, supervised_user_label);
+  EXPECT_EQ(item2.username, supervised_user_label);
 }
 
 }  // namespace