Replace SetAuthenticatedUsername with SetAuthenticatedAccountId.

chrome/browser/devtools/device/webrtc/devtools_bridge_client_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 "chrome/browser/devtools/device/webrtc/devtools_bridge_client_browsertest.h"
 
 #include "chrome/browser/devtools/device/webrtc/devtools_bridge_client.h"
 #include "chrome/browser/local_discovery/gcd_api_flow.h"
+#include "chrome/browser/signin/account_tracker_service_factory.h"
 #include "chrome/browser/signin/fake_profile_oauth2_token_service.h"
 #include "chrome/browser/signin/fake_signin_manager.h"
 #include "chrome/browser/ui/browser.h"
+#include "components/signin/core/browser/account_tracker_service.h"
 #include "content/public/browser/web_ui_message_handler.h"
 
+namespace {
+
+const char kGaiaId[] = "stub-user@example.com";
+const char kUsername[] = "stub-user@example.com";
+
+}  // namespace
+
 class DevToolsBridgeClientBrowserTest::GCDApiFlowMock
     : public local_discovery::GCDApiFlow {
  public:
   explicit GCDApiFlowMock(DevToolsBridgeClientBrowserTest* test)
       : test_(test), id_(++test->last_flow_id_) {
     test_->flows_[id_] = this;
   }
 
   ~GCDApiFlowMock() override { test_->flows_.erase(id_); }
 
@@ skipping 48 matching lines @@
     test_->RunJavascriptFunction("callbacks.browserListUpdated",
                                  new base::FundamentalValue(count));
   }
 
   scoped_ptr<local_discovery::GCDApiFlow> CreateGCDApiFlow() override {
     return make_scoped_ptr(new GCDApiFlowMock(test_));
   }
 
   void GoogleSigninSucceeded() {
     // This username is checked on Chrome OS.
-    const std::string username = "stub-user@example.com";
-    test_->fake_signin_manager_->SetAuthenticatedUsername(username);
-    identity_provider().GoogleSigninSucceeded("test_account", username,
-                                              "testing");
+    const std::string account_id =
+        AccountTrackerServiceFactory::GetForProfile(
+            test_->browser()->profile())
+                ->PickAccountIdForAccount(kGaiaId, kUsername);
+    test_->fake_signin_manager_->SetAuthenticatedAccountInfo(kGaiaId,
+                                                             kUsername);
+    identity_provider().GoogleSigninSucceeded(account_id, kUsername,
+                                              "password");
   }
 
  private:
   DevToolsBridgeClientBrowserTest* const test_;
 };
 
 class DevToolsBridgeClientBrowserTest::MessageHandler
     : public content::WebUIMessageHandler {
  public:
   explicit MessageHandler(DevToolsBridgeClientBrowserTest* test)
       : test_(test) {}
 
   void RegisterMessages() override {
     web_ui()->RegisterMessageCallback(
         "signIn", base::Bind(&MessageHandler::SignIn, base::Unretained(this)));
     web_ui()->RegisterMessageCallback(
         "gcdApiResponse",
         base::Bind(&MessageHandler::GCDApiResponse, base::Unretained(this)));
     web_ui()->RegisterMessageCallback(
         "queryDevices",
         base::Bind(&MessageHandler::QueryDevices, base::Unretained(this)));
   }
 
   void SignIn(const base::ListValue*) {
     if (test_->client_mock_.get())
       test_->client_mock_->GoogleSigninSucceeded();
-    test_->fake_token_service_->UpdateCredentials("test_user@gmail.com",
-                                                  "token");
+    const std::string account_id =
+        AccountTrackerServiceFactory::GetForProfile(
+            test_->browser()->profile())->PickAccountIdForAccount(kGaiaId,
+                                                                  kUsername);
+    test_->fake_token_service_->UpdateCredentials(account_id, "token");
   }
 
   void GCDApiResponse(const base::ListValue* params) {
     CHECK(params->GetSize() >= 2);
     int id;
     const base::DictionaryValue* response;
     CHECK(params->GetInteger(0, &id));
     CHECK(params->GetDictionary(1, &response));
 
     auto flow = test_->flows_.find(id);
@@ skipping 34 matching lines @@
   fake_signin_manager_.reset();
   WebUIBrowserTest::TearDownOnMainThread();
 }
 
 content::WebUIMessageHandler*
 DevToolsBridgeClientBrowserTest::GetMockMessageHandler() {
   if (!handler_.get())
     handler_.reset(new MessageHandler(this));
   return handler_.get();
 }