Add "Sign In" button to the account chooser on Mac.

chrome/browser/ui/passwords/password_dialog_controller_impl_unittest.cc

 // Copyright 2016 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/passwords/password_dialog_controller_impl.h"
 
 #include <memory>
 #include <utility>
 #include <vector>
 
@@ skipping 13 matching lines @@
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {
 
 using testing::ElementsAre;
 using testing::Pointee;
 using testing::StrictMock;
 
 const char kUsername[] = "user1";
+const char kUsername2[] = "user2";
 
 class MockPasswordPrompt : public AccountChooserPrompt,
                            public AutoSigninFirstRunPrompt {
  public:
   MockPasswordPrompt() = default;
 
   MOCK_METHOD0(ShowAccountChooser, void());
   MOCK_METHOD0(ShowAutoSigninPrompt, void());
   MOCK_METHOD0(ControllerGone, void());
 
@@ skipping 39 matching lines @@
   std::unique_ptr<content::WebContents> test_web_contents_;
   // Owned by |test_web_contents_|.
   ManagePasswordsUIControllerMock* ui_controller_mock_;
   PasswordDialogControllerImpl controller_;
 };
 
 TEST_F(PasswordDialogControllerTest, ShowAccountChooser) {
   base::HistogramTester histogram_tester;
   StrictMock<MockPasswordPrompt> prompt;
   autofill::PasswordForm local_form = GetLocalForm();
+  autofill::PasswordForm local_form2 = local_form;
+  local_form2.username_value = base::ASCIIToUTF16(kUsername2);
   autofill::PasswordForm idp_form = GetFederationProviderForm();
   std::vector<std::unique_ptr<autofill::PasswordForm>> locals;
   locals.push_back(base::WrapUnique(new autofill::PasswordForm(local_form)));
+  locals.push_back(base::WrapUnique(new autofill::PasswordForm(local_form2)));
   autofill::PasswordForm* local_form_ptr = locals[0].get();
   std::vector<std::unique_ptr<autofill::PasswordForm>> federations;
   federations.push_back(base::WrapUnique(new autofill::PasswordForm(idp_form)));
 
   EXPECT_CALL(prompt, ShowAccountChooser());
   controller().ShowAccountChooser(&prompt,
                                   std::move(locals), std::move(federations));
-  EXPECT_THAT(controller().GetLocalForms(), ElementsAre(Pointee(local_form)));
+  EXPECT_THAT(controller().GetLocalForms(), ElementsAre(Pointee(local_form),
+                                                        Pointee(local_form2)));
   EXPECT_THAT(controller().GetFederationsForms(),
               ElementsAre(Pointee(idp_form)));
+  EXPECT_FALSE(controller().ShouldShowSignInButton());
 
   // Close the dialog.
   EXPECT_CALL(prompt, ControllerGone());
   EXPECT_CALL(ui_controller_mock(), ChooseCredential(
       local_form,
       password_manager::CredentialType::CREDENTIAL_TYPE_PASSWORD));
   controller().OnChooseCredentials(
       *local_form_ptr,
       password_manager::CredentialType::CREDENTIAL_TYPE_PASSWORD);
   histogram_tester.ExpectUniqueSample(
       "PasswordManager.AccountChooserDialog",
        password_manager::metrics_util::ACCOUNT_CHOOSER_CREDENTIAL_CHOSEN, 1);
 }
 
+TEST_F(PasswordDialogControllerTest, ShowAccountChooserAndSignIn) {
+  base::HistogramTester histogram_tester;
+  StrictMock<MockPasswordPrompt> prompt;
+  autofill::PasswordForm local_form = GetLocalForm();
+  std::vector<std::unique_ptr<autofill::PasswordForm>> locals;
+  locals.push_back(base::WrapUnique(new autofill::PasswordForm(local_form)));
+  std::vector<std::unique_ptr<autofill::PasswordForm>> federations;
+
+  EXPECT_CALL(prompt, ShowAccountChooser());
+  controller().ShowAccountChooser(&prompt,
+                                  std::move(locals), std::move(federations));
+  EXPECT_THAT(controller().GetLocalForms(), ElementsAre(Pointee(local_form)));
+  EXPECT_THAT(controller().GetFederationsForms(), testing::IsEmpty());
+  EXPECT_TRUE(controller().ShouldShowSignInButton());
+
+  // Close the dialog.
+  EXPECT_CALL(prompt, ControllerGone());
+  EXPECT_CALL(ui_controller_mock(), ChooseCredential(
+      local_form,
+      password_manager::CredentialType::CREDENTIAL_TYPE_PASSWORD));
+  controller().OnSignInClicked();
+  histogram_tester.ExpectUniqueSample(
+      "PasswordManager.AccountChooserDialog",
+       password_manager::metrics_util::ACCOUNT_CHOOSER_SIGN_IN, 1);
+}
+
 TEST_F(PasswordDialogControllerTest, AccountChooserClosed) {
   base::HistogramTester histogram_tester;
   StrictMock<MockPasswordPrompt> prompt;
   EXPECT_CALL(prompt, ShowAccountChooser());
   controller().ShowAccountChooser(&prompt,
                                   PasswordDialogController::FormsVector(),
                                   PasswordDialogController::FormsVector());
 
   EXPECT_CALL(ui_controller_mock(), OnDialogHidden());
   controller().OnCloseDialog();
@@ skipping 65 matching lines @@
       "PasswordManager.AutoSigninFirstRunDialog",
        password_manager::metrics_util::AUTO_SIGNIN_TURN_OFF, 1);
 }
 
 TEST_F(PasswordDialogControllerTest, OnBrandLinkClicked) {
   EXPECT_CALL(ui_controller_mock(), NavigateToSmartLockHelpPage());
   controller().OnSmartLockLinkClicked();
 }
 
 }  // namespace