Restored Pre-Harmony Bubble title margin metrics

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 c6b846375c8c49251f2fff3a71109d13982d9300..a1b3391ec1bb2790955b3ff62148f50258ec0733 100644
--- a/chrome/browser/ui/views/passwords/password_dialog_view_browsertest.cc
+++ b/chrome/browser/ui/views/passwords/password_dialog_view_browsertest.cc
@@ -9,6 +9,7 @@
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/passwords/manage_passwords_ui_controller.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
+#include "chrome/browser/ui/test/test_browser_dialog.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
 #include "chrome/browser/ui/views/passwords/account_chooser_dialog_view.h"
 #include "chrome/browser/ui/views/passwords/auto_signin_first_run_dialog_view.h"
@@ -137,11 +138,14 @@ TestManagePasswordsUIController::CreateAutoSigninPrompt(
   return current_autosignin_prompt_;
 }
 
-class PasswordDialogViewTest : public InProcessBrowserTest {
+class PasswordDialogViewTest : public DialogBrowserTest {
  public:
   // InProcessBrowserTest:
   void SetUpOnMainThread() override;

[Peter Kasting, 2017/04/17 19:53:36]

Nit: Combine these two override blocks, since you no longer subclass this class
directly:

  // DialogBrowserTest:
  void SetUpOnMainThread() override;
  void ShowDialog(const std::string& name) override;

 
+  // DialogBrowserTest:
+  void ShowDialog(const std::string& name) override;
+
   void SetupChooseCredentials(
       std::vector<std::unique_ptr<autofill::PasswordForm>> local_credentials,
       const GURL& origin);
@@ -465,4 +469,28 @@ IN_PROC_BROWSER_TEST_F(PasswordDialogViewTest,
   ASSERT_TRUE(controller()->current_autosignin_prompt());
 }
 
+// DialogBrowserTest methods for interactive dialog invocation
+void PasswordDialogViewTest::ShowDialog(const std::string& name) {
+  GURL origin("https://example.com");
+  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));

[Peter Kasting, 2017/04/17 19:53:36]

Nit: Having to construct on the static and then copy-construct on the heap seems
really lame.  Can we add an n-arg constructor to PasswordForm so this can become
something like this?:

  std::vector<std::unique_ptr<autofill::PasswordForm>> local_credentials = {
    base::MakeUnique<autofill::PasswordForm>(...),
    base::MakeUnique<autofill::PasswordForm>(...),
  };

It seems like there are other places in this file that could benefit too.

This could be done as a separate change.

[kylix_rd, 2017/04/18 16:05:16]

That makes sense. I do, however, approach it from the angle that this code is
clearly working since it based on existing code within this same file. In a
"Hippocratic" sense, I'm not doing any harm with this code.
I'll add it to the list :)

+  GURL icon_url("https://google.com/icon.png");
+  form.icon_url = icon_url;
+  form.display_name = base::ASCIIToUTF16("Peter Pen");
+  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());
+}
+
+IN_PROC_BROWSER_TEST_F(PasswordDialogViewTest,
+                       InvokeDialog_PopupAutoSigninPrompt) {
+  RunDialog();
+}
+
 }  // namespace