[Android] Refactor PasswordManagerDialog

The method called to show the dialog used to take 9 parameters and the
list was growing. This CL bundles the parameters into a separate contents
object which requires the mandatory values to be passed in the constructor
and offers reasonable defaults and setters for the rest of the values.

In addition, some properties of the model are not actually meant to be
changed on the fly, so they are now marked readonly and set before building
the model. This requires a separate initialization step in the coordinator
and mediator.

Bug: 1028947
Change-Id: I4f121e5fee88d095d6c31add59111639e85faedb
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1948931
Commit-Queue: Ioana Pandele <ioanap@chromium.org>
Reviewed-by: Friedrich [CET] <fhorschig@chromium.org>
Cr-Commit-Position: refs/heads/master@{#721576}

chrome/android/chrome_java_sources.gni

@@ -1189,6 +1189,7 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/password_manager/PasswordGenerationDialogViewBinder.java",
   "java/src/org/chromium/chrome/browser/password_manager/PasswordGenerationPopupAdapter.java",
   "java/src/org/chromium/chrome/browser/password_manager/PasswordGenerationPopupBridge.java",
+  "java/src/org/chromium/chrome/browser/password_manager/PasswordManagerDialogContents.java",
   "java/src/org/chromium/chrome/browser/password_manager/PasswordManagerDialogCoordinator.java",
   "java/src/org/chromium/chrome/browser/password_manager/PasswordManagerDialogMediator.java",
   "java/src/org/chromium/chrome/browser/password_manager/PasswordManagerDialogProperties.java",

chrome/android/java/src/org/chromium/chrome/browser/password_manager/CredentialLeakDialogBridge.java

@@ -11,7 +11,6 @@ import org.chromium.chrome.browser.help.HelpAndFeedback;
 import org.chromium.chrome.browser.profiles.Profile;
 import org.chromium.ui.base.WindowAndroid;
 import org.chromium.ui.modaldialog.DialogDismissalCause;
-import org.chromium.ui.modaldialog.ModalDialogManager;
 
 import java.lang.ref.WeakReference;
 
@@ -27,9 +26,8 @@ public class CredentialLeakDialogBridge {
         ChromeActivity activity = (ChromeActivity) windowAndroid.getActivity().get();
         mActivity = new WeakReference<>(activity);
         mCredentialLeakDialog = new PasswordManagerDialogCoordinator(
-                windowAndroid.getContext().get(), activity.getModalDialogManager(),
-                activity.findViewById(android.R.id.content), activity.getFullscreenManager(),
-                activity.getControlContainerHeightResource(), true);
+                activity.getModalDialogManager(), activity.findViewById(android.R.id.content),
+                activity.getFullscreenManager(), activity.getControlContainerHeightResource());
     }
 
     @CalledByNative
@@ -41,11 +39,16 @@ public class CredentialLeakDialogBridge {
     @CalledByNative
     public void showDialog(String credentialLeakTitle, String credentialLeakDetails,
             String positiveButton, String negativeButton) {
-        boolean primaryButtonFilled = negativeButton != null;
-        mCredentialLeakDialog.addHelpButton(this::showHelpArticle);
-        mCredentialLeakDialog.showDialog(credentialLeakTitle, credentialLeakDetails,
-                R.drawable.password_check_warning, positiveButton, negativeButton, this::onClick,
-                primaryButtonFilled, ModalDialogManager.ModalDialogType.APP);
+        if (mActivity.get() == null) return;
+
+        PasswordManagerDialogContents contents = new PasswordManagerDialogContents(
+                credentialLeakTitle, credentialLeakDetails, R.drawable.password_check_warning,
+                positiveButton, negativeButton, this::onClick);
+        contents.setPrimaryButtonFilled(negativeButton != null);
+        contents.setHelpButtonCallback(this::showHelpArticle);
+
+        mCredentialLeakDialog.initialize(mActivity.get(), contents);
+        mCredentialLeakDialog.showDialog();
     }
 
     @CalledByNative

chrome/android/java/src/org/chromium/chrome/browser/password_manager/OnboardingDialogBridge.java

@@ -7,7 +7,7 @@ package org.chromium.chrome.browser.password_manager;
 import static org.chromium.chrome.browser.ChromeFeatureList.PASSWORD_MANAGER_ONBOARDING_ANDROID;
 import static org.chromium.chrome.browser.ChromeFeatureList.getFieldTrialParamByFeature;
 
-import android.content.res.Resources;
+import android.content.Context;
 
 import org.chromium.base.annotations.CalledByNative;
 import org.chromium.base.annotations.NativeMethods;
@@ -17,11 +17,14 @@ import org.chromium.ui.base.WindowAndroid;
 import org.chromium.ui.modaldialog.DialogDismissalCause;
 import org.chromium.ui.modaldialog.ModalDialogManager;
 
+import java.lang.ref.WeakReference;
+
 /** JNI call glue between the native password manager onboarding class and Java objects. */
 public class OnboardingDialogBridge {
     private long mNativeOnboardingDialogView;
     private final PasswordManagerDialogCoordinator mOnboardingDialog;
-    private final Resources mResources;
+    private final WeakReference<Context> mContext;
+
     /** Experiment parameter. */
     private static final String EXPERIMENT_PARAMETER = "story";
     /** Story centered on password safety and leak detection. */
@@ -33,11 +36,10 @@ public class OnboardingDialogBridge {
         mNativeOnboardingDialogView = nativeOnboardingDialogView;
         // TODO(crbug.com/983445): Get rid of this in favor of passing in direct dependencies.
         ChromeActivity activity = (ChromeActivity) windowAndroid.getActivity().get();
-        mOnboardingDialog = new PasswordManagerDialogCoordinator(windowAndroid.getContext().get(),
-                activity.getModalDialogManager(), activity.findViewById(android.R.id.content),
-                activity.getFullscreenManager(), activity.getControlContainerHeightResource(),
-                false);
-        mResources = activity.getResources();
+        mOnboardingDialog = new PasswordManagerDialogCoordinator(activity.getModalDialogManager(),
+                activity.findViewById(android.R.id.content), activity.getFullscreenManager(),
+                activity.getControlContainerHeightResource());
+        mContext = new WeakReference<>(activity);
     }
 
     @CalledByNative
@@ -64,10 +66,16 @@ public class OnboardingDialogBridge {
 
     @CalledByNative
     public void showDialog(String onboardingTitle, String onboardingDetails) {
-        mOnboardingDialog.showDialog(onboardingTitle, onboardingDetails,
-                getDrawableResourceFromFeature(), mResources.getString(R.string.continue_button),
-                mResources.getString(R.string.not_now), this::onClick, true,
-                ModalDialogManager.ModalDialogType.TAB);
+        if (mContext.get() == null) return;
+
+        PasswordManagerDialogContents contents = new PasswordManagerDialogContents(onboardingTitle,
+                onboardingDetails, getDrawableResourceFromFeature(),
+                mContext.get().getResources().getString(R.string.continue_button),
+                mContext.get().getResources().getString(R.string.not_now), this::onClick);
+        contents.setDialogType(ModalDialogManager.ModalDialogType.TAB);
+
+        mOnboardingDialog.initialize(mContext.get(), contents);
+        mOnboardingDialog.showDialog();
     }
 
     @CalledByNative

chrome/android/java/src/org/chromium/chrome/browser/password_manager/PasswordManagerDialogContents.java

+// Copyright 2019 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.
+package org.chromium.chrome.browser.password_manager;
+
+import android.support.annotation.IdRes;
+import android.support.annotation.Nullable;
+
+import org.chromium.base.Callback;
+import org.chromium.ui.modaldialog.ModalDialogManager;
+
+/**
+ * Class containing all data that customizes the contents displayed in the dialog.
+ */
+public class PasswordManagerDialogContents {
+    private final String mTitle;
+    private final String mDetails;
+    private final String mPrimaryButtonText;
+    private final @Nullable String mSecondaryButtonText;
+    private final @IdRes int mIllustrationId;
+    private final Callback<Integer> mButtonClickCallback;
+
+    private boolean mPrimaryButtonFilled;
+    private @Nullable Runnable mHelpButtonCallback;
+    private @ModalDialogManager.ModalDialogType int mDialogType;
+
+    /**
+     * Constructor for the dialog contents.
+     *
+     * @param title The title of the dialog, to be displayed below the image.
+     * @param details The details text to be displayed under the title.
+     * @param illustrationId The resource id of the image displayed above the title.
+     * @param primaryButtonText The text of the primary button.
+     * @param secondaryButtonText The text of the secondary button or null if there shouldn't be a
+     *      secondary button.
+     * @param buttonClickCallback The callback handling the click on the buttons. It takes the type
+     *      of the button as a parameter.
+     */
+    public PasswordManagerDialogContents(String title, String details, int illustrationId,
+            String primaryButtonText, @Nullable String secondaryButtonText,
+            Callback<Integer> buttonClickCallback) {
+        mTitle = title;
+        mDetails = details;
+        mPrimaryButtonText = primaryButtonText;
+        mSecondaryButtonText = secondaryButtonText;
+        mIllustrationId = illustrationId;
+        mButtonClickCallback = buttonClickCallback;
+        mPrimaryButtonFilled = false;
+        mHelpButtonCallback = null;
+        mDialogType = ModalDialogManager.ModalDialogType.APP;
+    }
+
+    /**
+     * Sets whether or not the primary button should be displayed as filled.
+     */
+    public void setPrimaryButtonFilled(boolean primaryButtonFilled) {
+        mPrimaryButtonFilled = primaryButtonFilled;
+    }
+
+    /**
+     * Sets a callback to be invoked when the help button is clicked. If left null, no help button
+     * will be displayed.
+     */
+    public void setHelpButtonCallback(Runnable helpButtonCallback) {
+        mHelpButtonCallback = helpButtonCallback;
+    }
+
+    /**
+     * Sets type of the modal dialog to be displayed: app or tab modal.
+     */
+    public void setDialogType(@ModalDialogManager.ModalDialogType int type) {
+        mDialogType = type;
+    }
+
+    /**
+     * Returns the title of the dialog. It is also used as content description.
+     */
+    public String getTitle() {
+        return mTitle;
+    }
+
+    /**
+     * Returns the details to be displayed in the dialog under the title.
+     */
+    public String getDetails() {
+        return mDetails;
+    }
+
+    /**
+     * Returns the text displayed in the primary button.
+     */
+    public String getPrimaryButtonText() {
+        return mPrimaryButtonText;
+    }
+
+    /**
+     * Returns the text displayed in the secondary button or null if the dialog has only one button.
+     */
+    @Nullable
+    public String getSecondaryButtonText() {
+        return mSecondaryButtonText;
+    }
+
+    /**
+     * The resource id of the image displayed above the title.
+     */
+    public @IdRes int getIllustrationId() {
+        return mIllustrationId;
+    }
+
+    /**
+     * The callback invoked when either of the two dialog buttons is clicked.
+     * @return A {@link Callback} taking an {@link Integer} as a parameter which represents which
+     *         button was clicked.
+     */
+    public Callback getButtonClickCallback() {
+        return mButtonClickCallback;
+    }
+
+    /**
+     * Whether the primary button should be displayed as filled or not.
+     */
+    public boolean isPrimaryButtonFilled() {
+        return mPrimaryButtonFilled;
+    }
+
+    /**
+     * Returns the callback handling the click on the help icon or null if no help icon should be
+     * displayed.
+     */
+    @Nullable
+    public Runnable getHelpButtonCallback() {
+        return mHelpButtonCallback;
+    }
+
+    /**
+     * The type of the dialog: app modal or tab modal.
+     */
+    public @ModalDialogManager.ModalDialogType int getDialogType() {
+        return mDialogType;
+    }
+}

chrome/android/java/src/org/chromium/chrome/browser/password_manager/PasswordManagerDialogCoordinator.java

@@ -4,14 +4,17 @@
 
 package org.chromium.chrome.browser.password_manager;
 
+import static org.chromium.chrome.browser.password_manager.PasswordManagerDialogProperties.DETAILS;
+import static org.chromium.chrome.browser.password_manager.PasswordManagerDialogProperties.HELP_BUTTON_CALLBACK;
+import static org.chromium.chrome.browser.password_manager.PasswordManagerDialogProperties.ILLUSTRATION;
+import static org.chromium.chrome.browser.password_manager.PasswordManagerDialogProperties.TITLE;
+
 import android.content.Context;
 import android.view.LayoutInflater;
 import android.view.View;
 
-import androidx.annotation.DrawableRes;
 import androidx.annotation.VisibleForTesting;
 
-import org.chromium.base.Callback;
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.fullscreen.ChromeFullscreenManager;
 import org.chromium.ui.modaldialog.DialogDismissalCause;
@@ -26,42 +29,41 @@ import org.chromium.ui.modelutil.PropertyModelChangeProcessor;
  */
 public class PasswordManagerDialogCoordinator {
     private final PasswordManagerDialogMediator mMediator;
+    private PropertyModel mModel;
+
+    PasswordManagerDialogCoordinator(ModalDialogManager modalDialogManager, View androidContentView,
+            ChromeFullscreenManager fullscreenManager, int containerHeightResource) {
+        mMediator = new PasswordManagerDialogMediator(
+                new PropertyModel.Builder(ModalDialogProperties.ALL_KEYS), modalDialogManager,
+                androidContentView, fullscreenManager, containerHeightResource);
+    }
 
-    PasswordManagerDialogCoordinator(Context context, ModalDialogManager modalDialogManager,
-            View androidContentView, ChromeFullscreenManager fullscreenManager,
-            int containerHeightResource, boolean withHelpIcon) {
-        PropertyModel mModel = PasswordManagerDialogProperties.defaultModelBuilder().build();
-        View customView = withHelpIcon
+    public void initialize(Context context, PasswordManagerDialogContents contents) {
+        View customView = contents.getHelpButtonCallback() != null
                 ? LayoutInflater.from(context).inflate(
                         R.layout.password_manager_dialog_with_help_button, null)
                 : LayoutInflater.from(context).inflate(R.layout.password_manager_dialog, null);
-
-        mMediator = new PasswordManagerDialogMediator(mModel, createDialogModelBuilder(customView),
-                modalDialogManager, androidContentView, customView.getResources(),
-                fullscreenManager, containerHeightResource);
+        mModel = buildModel(contents);
+        mMediator.initialize(mModel, customView, contents);
         PropertyModelChangeProcessor.create(
                 mModel, customView, PasswordManagerDialogViewBinder::bind);
     }
 
-    public void showDialog(String title, String details, @DrawableRes int drawableId,
-            String positiveButtonText, String negativeButtonText, Callback<Integer> onClick,
-            boolean primaryButtonFilled, @ModalDialogManager.ModalDialogType int type) {
-        mMediator.setContents(title, details, drawableId);
-        mMediator.setButtons(positiveButtonText, negativeButtonText, onClick, primaryButtonFilled);
-        mMediator.showDialog(type);
-    }
-
-    public void addHelpButton(Runnable callback) {
-        mMediator.setHelpButtonCallback(callback);
+    public void showDialog() {
+        mMediator.showDialog();
     }
 
     public void dismissDialog(@DialogDismissalCause int dismissalCause) {
         mMediator.dismissDialog(dismissalCause);
     }
 
-    private static PropertyModel.Builder createDialogModelBuilder(View customView) {
-        return new PropertyModel.Builder(ModalDialogProperties.ALL_KEYS)
-                .with(ModalDialogProperties.CUSTOM_VIEW, customView);
+    private PropertyModel buildModel(PasswordManagerDialogContents contents) {
+        return PasswordManagerDialogProperties.defaultModelBuilder()
+                .with(TITLE, contents.getTitle())
+                .with(DETAILS, contents.getDetails())
+                .with(ILLUSTRATION, contents.getIllustrationId())
+                .with(HELP_BUTTON_CALLBACK, contents.getHelpButtonCallback())
+                .build();
     }
 
     @VisibleForTesting

chrome/android/java/src/org/chromium/chrome/browser/password_manager/PasswordManagerDialogMediator.java

@@ -4,16 +4,11 @@
 
 package org.chromium.chrome.browser.password_manager;
 
-import static org.chromium.chrome.browser.password_manager.PasswordManagerDialogProperties.DETAILS;
-import static org.chromium.chrome.browser.password_manager.PasswordManagerDialogProperties.HELP_BUTTON_CALLBACK;
-import static org.chromium.chrome.browser.password_manager.PasswordManagerDialogProperties.ILLUSTRATION;
 import static org.chromium.chrome.browser.password_manager.PasswordManagerDialogProperties.ILLUSTRATION_VISIBLE;
-import static org.chromium.chrome.browser.password_manager.PasswordManagerDialogProperties.TITLE;
 
 import android.content.res.Resources;
 import android.view.View;
 
-import androidx.annotation.DrawableRes;
 import androidx.annotation.VisibleForTesting;
 
 import org.chromium.base.Callback;
@@ -32,15 +27,17 @@ import org.chromium.ui.modelutil.PropertyModel;
  * dialog).
  */
 class PasswordManagerDialogMediator implements View.OnLayoutChangeListener {
-    private final PropertyModel mModel;
     private final ModalDialogManager mDialogManager;
-    private PropertyModel.Builder mModalDialogBuilder;
-    private PropertyModel mDialogModel;
     private final View mAndroidContentView;
-    private final Resources mResources;
     private final ChromeFullscreenManager mFullscreenManager;
     private final int mContainerHeightResource;
 
+    private PropertyModel.Builder mHostDialogModelBuilder;
+    private PropertyModel mHostDialogModel;
+    private PropertyModel mModel;
+    private Resources mResources;
+    private @ModalDialogManager.ModalDialogType int mDialogType;
+
     private static class DialogClickHandler implements ModalDialogProperties.Controller {
         private Callback<Integer> mCallback;
 
@@ -68,39 +65,38 @@ class PasswordManagerDialogMediator implements View.OnLayoutChangeListener {
         }
     }
 
-    PasswordManagerDialogMediator(PropertyModel model, PropertyModel.Builder dialogBuilder,
-            ModalDialogManager manager, View androidContentView, Resources resources,
+    PasswordManagerDialogMediator(PropertyModel.Builder hostDialogModelBuilder,
+            ModalDialogManager manager, View androidContentView,
             ChromeFullscreenManager fullscreenManager, int containerHeightResource) {
-        mModel = model;
         mDialogManager = manager;
-        mModalDialogBuilder = dialogBuilder;
+        mHostDialogModelBuilder = hostDialogModelBuilder;
         mAndroidContentView = androidContentView;
-        mResources = resources;
         mFullscreenManager = fullscreenManager;
         mContainerHeightResource = containerHeightResource;
         mAndroidContentView.addOnLayoutChangeListener(this);
     }
 
-    void setContents(String title, String details, @DrawableRes int drawableId) {
-        mModel.set(ILLUSTRATION, drawableId);
-        mModel.set(TITLE, title);
-        mModalDialogBuilder.with(ModalDialogProperties.CONTENT_DESCRIPTION, title);
-        mModel.set(DETAILS, details);
-    }
-
-    void setButtons(String positiveButtonText, String negativeButtonText, Callback<Integer> onClick,
-            boolean primaryButtonFilled) {
-        mModalDialogBuilder.with(ModalDialogProperties.CONTROLLER, new DialogClickHandler(onClick))
-                .with(ModalDialogProperties.POSITIVE_BUTTON_TEXT, positiveButtonText)
-                .with(ModalDialogProperties.NEGATIVE_BUTTON_TEXT, negativeButtonText)
-                .with(ModalDialogProperties.PRIMARY_BUTTON_FILLED, primaryButtonFilled);
-    }
-
-    void setHelpButtonCallback(Runnable callback) {
-        mModel.set(HELP_BUTTON_CALLBACK, callback);
+    void initialize(PropertyModel model, View view, PasswordManagerDialogContents contents) {
+        mResources = view.getResources();
+        mModel = model;
+        mHostDialogModel =
+                mHostDialogModelBuilder.with(ModalDialogProperties.CUSTOM_VIEW, view)
+                        .with(ModalDialogProperties.CONTROLLER,
+                                new DialogClickHandler(contents.getButtonClickCallback()))
+                        .with(ModalDialogProperties.CONTENT_DESCRIPTION, contents.getTitle())
+                        .with(ModalDialogProperties.POSITIVE_BUTTON_TEXT,
+                                contents.getPrimaryButtonText())
+                        .with(ModalDialogProperties.NEGATIVE_BUTTON_TEXT,
+                                contents.getSecondaryButtonText())
+                        .with(ModalDialogProperties.PRIMARY_BUTTON_FILLED,
+                                contents.isPrimaryButtonFilled())
+                        .build();
+        mDialogType = contents.getDialogType();
     }
 
     private boolean hasSufficientSpaceForIllustration(int heightPx) {
+        // If |mResources| is null, it means that the dialog was not initialized yet.
+        if (mResources == null) return false;
         heightPx -= TabModalPresenter.getContainerTopMargin(mResources, mContainerHeightResource);
         heightPx -= TabModalPresenter.getContainerBottomMargin(mFullscreenManager);
         return heightPx >= mResources.getDimensionPixelSize(
@@ -110,6 +106,8 @@ class PasswordManagerDialogMediator implements View.OnLayoutChangeListener {
     @Override
     public void onLayoutChange(View view, int left, int top, int right, int bottom, int oldLeft,
             int oldTop, int oldRight, int oldBottom) {
+        // Return if the dialog wasn't initialized
+        if (mModel == null) return;
         int oldHeight = oldBottom - oldTop;
         int newHeight = bottom - top;
         if (newHeight == oldHeight) return;
@@ -118,15 +116,15 @@ class PasswordManagerDialogMediator implements View.OnLayoutChangeListener {
         });
     }
 
-    void showDialog(@ModalDialogManager.ModalDialogType int type) {
+    void showDialog() {
         mModel.set(ILLUSTRATION_VISIBLE,
                 hasSufficientSpaceForIllustration(mAndroidContentView.getHeight()));
-        mDialogModel = mModalDialogBuilder.build();
-        mDialogManager.showDialog(mDialogModel, type);
+        mHostDialogModel = mHostDialogModelBuilder.build();
+        mDialogManager.showDialog(mHostDialogModel, mDialogType);
     }
 
-    void dismissDialog(int dismissalClause) {
-        mDialogManager.dismissDialog(mDialogModel, dismissalClause);
+    void dismissDialog(int dismissalCause) {
+        mDialogManager.dismissDialog(mHostDialogModel, dismissalCause);
         mAndroidContentView.removeOnLayoutChangeListener(this);
     }
 

chrome/android/java/src/org/chromium/chrome/browser/password_manager/PasswordManagerDialogProperties.java

@@ -5,30 +5,29 @@
 package org.chromium.chrome.browser.password_manager;
 
 import org.chromium.ui.modelutil.PropertyModel;
+import org.chromium.ui.modelutil.PropertyModel.ReadableIntPropertyKey;
+import org.chromium.ui.modelutil.PropertyModel.ReadableObjectPropertyKey;
 import org.chromium.ui.modelutil.PropertyModel.WritableBooleanPropertyKey;
-import org.chromium.ui.modelutil.PropertyModel.WritableIntPropertyKey;
-import org.chromium.ui.modelutil.PropertyModel.WritableObjectPropertyKey;
 
 /**
  * Data properties for the password manager illustration modal dialog.
  */
 class PasswordManagerDialogProperties {
     // Callback handling clicks on the help button. If present, the button will be shown.
-    static final WritableObjectPropertyKey<Runnable> HELP_BUTTON_CALLBACK =
-            new WritableObjectPropertyKey<>();
+    static final ReadableObjectPropertyKey<Runnable> HELP_BUTTON_CALLBACK =
+            new ReadableObjectPropertyKey<>();
 
     // Illustration drawable resource id for the password manager.
-    static final WritableIntPropertyKey ILLUSTRATION = new WritableIntPropertyKey();
+    static final ReadableIntPropertyKey ILLUSTRATION = new ReadableIntPropertyKey();
 
     // Boolean indicating whether there is enough space for the illustration to be shown.
     static final WritableBooleanPropertyKey ILLUSTRATION_VISIBLE = new WritableBooleanPropertyKey();
 
     // Title that appears below the illustration.
-    static final WritableObjectPropertyKey<String> TITLE = new WritableObjectPropertyKey<>();
+    static final ReadableObjectPropertyKey<String> TITLE = new ReadableObjectPropertyKey<>();
 
     // Multiline explanation text displayed under the illustration.
-    static final WritableObjectPropertyKey<CharSequence> DETAILS =
-            new WritableObjectPropertyKey<>();
+    static final ReadableObjectPropertyKey<String> DETAILS = new ReadableObjectPropertyKey<>();
 
     private PasswordManagerDialogProperties() {}
 

chrome/android/java/src/org/chromium/chrome/browser/password_manager/PasswordManagerDialogView.java

@@ -71,7 +71,7 @@ public class PasswordManagerDialogView extends ScrollView {
         mTitleView.setText(title);
     }
 
-    void setDetails(CharSequence details) {
+    void setDetails(String details) {
         mDetailsView.setText(details);
     }
 }

chrome/android/javatests/src/org/chromium/chrome/browser/password_manager/PasswordManagerDialogTest.java

@@ -67,17 +67,16 @@ public class PasswordManagerDialogTest {
     public void setUp() throws InterruptedException {
         mActivityTestRule.startMainActivityOnBlankPage();
         ChromeActivity activity = (ChromeActivity) mActivityTestRule.getActivity();
-        mCoordinator = new PasswordManagerDialogCoordinator(
-                activity.getWindowAndroid().getContext().get(), activity.getModalDialogManager(),
+        mCoordinator = new PasswordManagerDialogCoordinator(activity.getModalDialogManager(),
                 activity.findViewById(android.R.id.content), activity.getFullscreenManager(),
-                activity.getControlContainerHeightResource(), false);
+                activity.getControlContainerHeightResource());
+        PasswordManagerDialogContents contents = new PasswordManagerDialogContents(TITLE, DETAILS,
+                R.drawable.data_reduction_illustration, OK_BUTTON, CANCEL_BUTTON, mOnClick);
+        contents.setDialogType(ModalDialogManager.ModalDialogType.TAB);
+        mCoordinator.initialize(activity.getWindowAndroid().getContext().get(), contents);
         mMediator = mCoordinator.getMediatorForTesting();
         mModel = mMediator.getModelForTesting();
-        TestThreadUtils.runOnUiThreadBlocking(() -> {
-            mCoordinator.showDialog(TITLE, DETAILS, R.drawable.data_reduction_illustration,
-                    OK_BUTTON, CANCEL_BUTTON, mOnClick, false,
-                    ModalDialogManager.ModalDialogType.TAB);
-        });
+        TestThreadUtils.runOnUiThreadBlocking(() -> { mCoordinator.showDialog(); });
     }
 
     @Test