Replace SetAuthenticatedUsername with SetAuthenticatedAccountId.

chrome/browser/ui/webui/options/options_ui_browsertest.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/ui/webui/options/options_ui_browsertest.h"
 
 #include "base/prefs/pref_service.h"
 #include "base/scoped_observer.h"
 #include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/chrome_notification_types.h"
+#include "chrome/browser/signin/account_tracker_service_factory.h"
 #include "chrome/browser/signin/signin_manager_factory.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/chrome_pages.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/webui/options/options_ui.h"
 #include "chrome/browser/ui/webui/uber/uber_ui.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/grit/generated_resources.h"
 #include "chrome/test/base/ui_test_utils.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/browser/render_frame_host.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/test/browser_test_utils.h"
 #include "content/public/test/test_utils.h"
 #include "ui/base/l10n/l10n_util.h"
 
 #if !defined(OS_CHROMEOS)
 #include <string>
@@ skipping 210 matching lines @@
       browser()->tab_strip_model()->GetActiveWebContents(),
       "$('disconnect-managed-profile-ok').click();"));
 
   EXPECT_TRUE(profile_info_cache.GetIndexOfProfileWithPath(profile_dir) ==
               std::string::npos);
 
   wait_for_browser_closed.Wait();
 }
 
 IN_PROC_BROWSER_TEST_F(OptionsUIBrowserTest, VerifyUnmanagedSignout) {
+  const std::string user = "test@example.com";
+  std::string account_id =
+      AccountTrackerServiceFactory::GetForProfile(browser()->profile())
+      ->SeedAccountInfo("12345", user);
   SigninManager* signin =
       SigninManagerFactory::GetForProfile(browser()->profile());
-  const std::string user = "test@example.com";
-  signin->OnExternalSigninCompleted(user);
+  signin->OnExternalSigninCompleted(account_id);
 
   NavigateToSettingsFrame();
 
   // This script simulates a click on the "Disconnect your Google Account"
   // button and returns true if the hidden flag of the appropriate dialog gets
   // flipped.
   bool result = false;
   ASSERT_TRUE(content::ExecuteScriptAndExtractBool(
       browser()->tab_strip_model()->GetActiveWebContents(),
       "var dialog = $('sync-setup-stop-syncing');"
       "var original_status = dialog.hidden;"
       "$('start-stop-sync').click();"
       "domAutomationController.send(original_status && !dialog.hidden);",
       &result));
 
   EXPECT_TRUE(result);
 
   SignOutWaiter sign_out_waiter(signin);
 
   ASSERT_TRUE(content::ExecuteScript(
       browser()->tab_strip_model()->GetActiveWebContents(),
       "$('stop-syncing-ok').click();"));
 
   sign_out_waiter.Wait();
 
   EXPECT_TRUE(browser()->profile()->GetProfileUserName() != user);

[Evan Stade, 2015/04/17 18:08:51]

nit: EXPECT_NE

   EXPECT_FALSE(signin->IsAuthenticated());
 }
 
 // Regression test for http://crbug.com/301436, excluded on Chrome OS because
 // profile management in the settings UI exists on desktop platforms only.
 IN_PROC_BROWSER_TEST_F(OptionsUIBrowserTest, NavigateBackFromOverlayDialog) {
   NavigateToSettingsFrame();
 
   // Click a button that opens an overlay dialog.
   content::WebContents* contents =
@@ skipping 32 matching lines @@
   run_loop.Run();
 
   // Verify that the settings page has updated and lists two profiles.
   ASSERT_TRUE(content::ExecuteScriptAndExtractInt(
       contents, javascript, &profiles));
   EXPECT_EQ(2, profiles);
 }
 #endif
 
 }  // namespace options