Replace direct access to kGoogleServicesUsername with calls to SigninManager.

chrome/browser/ui/webui/options/chromeos/accounts_options_browsertest.cc

 // Copyright 2014 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/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/prefs/pref_service.h"
 #include "chrome/browser/chromeos/login/login_manager_test.h"
 #include "chrome/browser/chromeos/login/startup_utils.h"
 #include "chrome/browser/chromeos/login/ui/user_adding_screen.h"
 #include "chrome/browser/chromeos/profiles/profile_helper.h"
 #include "chrome/browser/chromeos/settings/cros_settings.h"
 #include "chrome/browser/chromeos/settings/stub_cros_settings_provider.h"
+#include "chrome/browser/signin/signin_manager_factory.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "chromeos/settings/cros_settings_names.h"
+#include "components/signin/core/browser/signin_manager.h"
 #include "components/user_manager/user_manager.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/test/browser_test_utils.h"
 #include "content/public/test/test_utils.h"
 
 namespace chromeos {
 
 namespace {
 
 const char* kTestUsers[] = { "test-user1@gmail.com", "test-user2@gmail.com" };
@@ skipping 26 matching lines @@
     LoginManagerTest::TearDownOnMainThread();
   }
 
   virtual void SetUpCommandLine(CommandLine* command_line) override {
     LoginManagerTest::SetUpCommandLine(command_line);
   }
 
  protected:
   void CheckAccountsUI(const user_manager::User* user, bool is_owner) {
     Profile* profile = ProfileHelper::Get()->GetProfileByUserUnsafe(user);
-    profile->GetPrefs()->SetString(prefs::kGoogleServicesUsername,
-                                   user->email());
+    SigninManagerFactory::GetForProfile(profile)->
+        SetAuthenticatedUsername(user->email());

[xiyuan, 2014/12/04 19:02:29]

I am not sure why we need to do this explicitly.
LoginManagerTest::AddUserToSession should have taken care of this. Maybe we
should just delete this line. Can you give that a try?

[Roger Tawa OOO till Jul 10th, 2014/12/04 22:26:47]

Yup, you are correct. No need to set authenticated user at all.  Removed.

 
     ui_test_utils::BrowserAddedObserver observer;
     Browser* browser = CreateBrowser(profile);
     observer.WaitForSingleNewBrowser();
 
     ui_test_utils::NavigateToURL(browser,
                                  GURL("chrome://settings-frame/accounts"));
     content::WebContents* contents =
         browser->tab_strip_model()->GetActiveWebContents();
 
@@ skipping 59 matching lines @@
   AddUser(kTestUsers[1]);
 
   user_manager::UserManager* manager = user_manager::UserManager::Get();
   ASSERT_EQ(2u, manager->GetLoggedInUsers().size());
 
   CheckAccountsUI(manager->FindUser(kTestUsers[0]), true /* is_owner */);
   CheckAccountsUI(manager->FindUser(kTestUsers[1]), false /* is_owner */);
 }
 
 }  // namespace chromeos