Harmonizing SmartLock dialog

chrome/browser/ui/views/passwords/password_dialog_view_browsertest.cc

Index: chrome/browser/ui/views/passwords/password_dialog_view_browsertest.cc
diff --git a/chrome/browser/ui/views/passwords/password_dialog_view_browsertest.cc b/chrome/browser/ui/views/passwords/password_dialog_view_browsertest.cc
index 7e573535796fbef7922a87a3d51bce045a9ccf7f..3ceb8f92b1023896ba2311a4186f9d2cb90fd0bb 100644
--- a/chrome/browser/ui/views/passwords/password_dialog_view_browsertest.cc
+++ b/chrome/browser/ui/views/passwords/password_dialog_view_browsertest.cc
@@ -470,21 +470,28 @@ IN_PROC_BROWSER_TEST_F(PasswordDialogViewTest,
 // DialogBrowserTest methods for interactive dialog invocation.
 void PasswordDialogViewTest::ShowDialog(const std::string& name) {
   GURL origin("https://example.com");
-  EXPECT_EQ("PopupAutoSigninPrompt", name);
   std::vector<std::unique_ptr<autofill::PasswordForm>> local_credentials;
   autofill::PasswordForm form;
   form.origin = origin;
   form.display_name = base::ASCIIToUTF16("Peter");
   form.username_value = base::ASCIIToUTF16("peter@pan.test");
-  form.icon_url = GURL("broken url");
-  local_credentials.push_back(base::MakeUnique<autofill::PasswordForm>(form));
-  GURL icon_url("https://google.com/icon.png");
-  form.icon_url = icon_url;
-  form.display_name = base::ASCIIToUTF16("Peter Pan");
-  form.federation_origin = url::Origin(GURL("https://google.com/federation"));
-  local_credentials.push_back(base::MakeUnique<autofill::PasswordForm>(form));
-  SetupChooseCredentials(std::move(local_credentials), origin);
-  ASSERT_TRUE(controller()->current_account_chooser());
+  if (name == "PopupAutoSigninPrompt") {
+    form.icon_url = GURL("broken url");
+    local_credentials.push_back(base::MakeUnique<autofill::PasswordForm>(form));
+    GURL icon_url("https://google.com/icon.png");

[Peter Kasting, 2017/04/24 22:48:31]

Nit: Inline into next line

[kylix_rd, 2017/04/25 17:14:07]

Done.

+    form.icon_url = icon_url;
+    form.display_name = base::ASCIIToUTF16("Peter Pan");
+    form.federation_origin = url::Origin(GURL("https://google.com/federation"));
+    local_credentials.push_back(base::MakeUnique<autofill::PasswordForm>(form));
+    SetupChooseCredentials(std::move(local_credentials), origin);
+    ASSERT_TRUE(controller()->current_account_chooser());
+  } else if (name == "PopupAccountChooserWithSingleCredentialClickSignIn") {
+    local_credentials.push_back(base::MakeUnique<autofill::PasswordForm>(form));
+    SetupChooseCredentials(std::move(local_credentials), origin);
+  } else {
+    ADD_FAILURE() << "Unknown dialog type";
+    return;
+  }
 }
 
 IN_PROC_BROWSER_TEST_F(PasswordDialogViewTest,
@@ -492,4 +499,10 @@ IN_PROC_BROWSER_TEST_F(PasswordDialogViewTest,
   RunDialog();
 }
 
+IN_PROC_BROWSER_TEST_F(
+    PasswordDialogViewTest,
+    InvokeDialog_PopupAccountChooserWithSingleCredentialClickSignIn) {
+  RunDialog();
+}
+
 }  // namespace