[sms] Refactor SMS dialog to use xml layout

This CL updates SMS dialog to use xml layout.

I uploaded some screenshots of the SMS dialog on the issue page.

Bug: 987799
Change-Id: I46e27aefd19104b4bba5032076bc31b0b203a730
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1725519
Commit-Queue: Jun Cai <juncai@chromium.org>
Reviewed-by: Yusuf Ozuysal <yusufo@chromium.org>
Reviewed-by: Kinuko Yasuda <kinuko@chromium.org>
Reviewed-by: Reilly Grant <reillyg@chromium.org>
Cr-Commit-Position: refs/heads/master@{#684114}

chrome/android/java/res/drawable/sms_receiver_dialog_background.xml

+<?xml version="1.0" encoding="utf-8"?>
+<!-- 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. -->
+
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="@color/default_bg_color_light"/>
+    <corners android:radius="10dp"/>
+</shape>

chrome/android/java/res/layout/sms_receiver_dialog.xml

+<?xml version="1.0" encoding="utf-8"?>
+<!-- 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.
+ -->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    android:paddingTop="16dp"
+    android:paddingBottom="16dp"
+    android:background="@drawable/sms_receiver_dialog_background">
+    <!-- The title at the top. -->
+    <TextView
+        android:id="@+id/dialog_title"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:paddingStart="32dp"
+        android:paddingTop="16dp"
+        android:paddingBottom="12dp"
+        android:text="@string/sms_dialog_title"
+        android:textAppearance="@style/TextAppearance.BlackHint1" />
+    <!-- Status row. -->
+    <LinearLayout
+        android:id="@+id/status_row"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingTop="12dp"
+        android:paddingBottom="32dp"
+        android:gravity="center" >
+        <!-- A layout containing a spinning progress bar that gets replaced with a
+         done icon. -->
+        <FrameLayout
+            android:id="@+id/container"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content" >
+            <ImageView
+                android:id="@+id/done_icon"
+                android:layout_height="20dp"
+                android:layout_width="20dp"
+                android:visibility="gone"
+                app:srcCompat="@drawable/ic_check_circle_blue_18dp"
+                tools:ignore="ContentDescription" />
+            <ProgressBar
+                android:id="@+id/progress"
+                android:layout_width="20dp"
+                android:layout_height="20dp"
+                android:indeterminate="true" />
+        </FrameLayout>
+        <!-- The status. -->
+        <TextView
+            android:id="@+id/status"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:paddingStart="16dp"
+            android:paddingEnd="16dp"
+            android:text="@string/sms_dialog_status_waiting"
+            android:textAppearance="@style/TextAppearance.BlackTitle1" />
+    </LinearLayout>
+    <!-- Button row. -->
+    <org.chromium.chrome.browser.widget.DualControlLayout
+        android:id="@+id/button_bar"
+        android:layout_width="match_parent"
+        android:layout_height="36dp"
+        android:paddingStart="16dp"
+        android:paddingEnd="16dp"
+        app:stackedMargin="@dimen/button_bar_stacked_margin"
+        app:buttonAlignment="end">
+        <org.chromium.ui.widget.ButtonCompat
+            android:id="@+id/confirm_button"
+            android:layout_height="wrap_content"
+            android:layout_width="wrap_content"
+            android:layout_gravity="end"
+            android:text="@string/sms_dialog_confirm_button_text"
+            android:enabled="false"
+            style="@style/TextButton" />
+        <org.chromium.ui.widget.ButtonCompat
+            android:id="@+id/cancel_button"
+            android:layout_height="wrap_content"
+            android:layout_width="wrap_content"
+            android:layout_gravity="end"
+            android:text="@string/cancel"
+            android:enabled="true"
+            style="@style/TextButton" />
+    </org.chromium.chrome.browser.widget.DualControlLayout>
+</LinearLayout>

chrome/android/java/src/org/chromium/chrome/browser/sms/SmsReceiverDialog.java

@@ -5,12 +5,18 @@
 package org.chromium.chrome.browser.sms;
 
 import android.app.Activity;
-import android.app.ProgressDialog;
-import android.content.DialogInterface;
-import android.content.DialogInterface.OnClickListener;
-import android.graphics.drawable.Drawable;
-import android.support.v7.content.res.AppCompatResources;
+import android.app.Dialog;
+import android.graphics.Color;
+import android.graphics.drawable.ColorDrawable;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup.LayoutParams;
+import android.view.Window;
 import android.widget.Button;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.ProgressBar;
+import android.widget.TextView;
 
 import org.chromium.base.Log;
 import org.chromium.base.VisibleForTesting;
@@ -27,8 +33,13 @@ public class SmsReceiverDialog {
     private static final String TAG = "SmsReceiverDialog";
     private static final boolean DEBUG = false;
     private long mNativeSmsDialogAndroid;
-    private ProgressDialog mDialog;
     private Activity mActivity;
+    // The dialog this class encapsulates.
+    private Dialog mDialog;
+    private ProgressBar mProgressBar;
+    private ImageView mDoneIcon;
+    private TextView mStatus;
+    private Button mConfirmButton;
 
     @VisibleForTesting
     @CalledByNative
@@ -37,40 +48,48 @@ public class SmsReceiverDialog {
         return new SmsReceiverDialog(nativeSmsDialogAndroid);
     }
 
-    private static ProgressDialog createDialog(Activity activity, long nativeSmsDialogAndroid) {
-        ProgressDialog dialog = new ProgressDialog(activity);
-        dialog.setIndeterminate(true);
-        dialog.setCancelable(false);
-        dialog.setCanceledOnTouchOutside(false);
-        dialog.setTitle(activity.getText(R.string.sms_dialog_title));
-        dialog.setMessage(activity.getText(R.string.sms_dialog_status_waiting));
-
-        dialog.setButton(DialogInterface.BUTTON_NEGATIVE, activity.getText(R.string.cancel),
-                new OnClickListener() {
-                    @Override
-                    public void onClick(DialogInterface prompt, int which) {
-                        assert nativeSmsDialogAndroid != 0;
-                        prompt.dismiss();
-                        SmsReceiverDialogJni.get().onCancel(nativeSmsDialogAndroid);
-                    }
-                });
-        dialog.setButton(DialogInterface.BUTTON_POSITIVE,
-                activity.getText(R.string.sms_dialog_continue_button_text), new OnClickListener() {
-                    @Override
-                    public void onClick(DialogInterface prompt, int which) {
-                        assert nativeSmsDialogAndroid != 0;
-                        prompt.dismiss();
-                        SmsReceiverDialogJni.get().onContinue(nativeSmsDialogAndroid);
-                    }
-                });
-
-        return dialog;
-    }
-
     private SmsReceiverDialog(long nativeSmsDialogAndroid) {
         mNativeSmsDialogAndroid = nativeSmsDialogAndroid;
     }
 
+    private void createAndShowDialog(WindowAndroid windowAndroid) {
+        mActivity = windowAndroid.getActivity().get();
+
+        LinearLayout dialogContainer = (LinearLayout) LayoutInflater.from(mActivity).inflate(
+                R.layout.sms_receiver_dialog, null);
+
+        mProgressBar = (ProgressBar) dialogContainer.findViewById(R.id.progress);
+
+        mDoneIcon = (ImageView) dialogContainer.findViewById(R.id.done_icon);
+
+        mStatus = (TextView) dialogContainer.findViewById(R.id.status);
+
+        Button cancelButton = (Button) dialogContainer.findViewById(R.id.cancel_button);
+        cancelButton.setOnClickListener(v -> {
+            assert mNativeSmsDialogAndroid != 0;
+            SmsReceiverDialogJni.get().onCancel(mNativeSmsDialogAndroid);
+        });
+
+        mConfirmButton = (Button) dialogContainer.findViewById(R.id.confirm_button);
+        mConfirmButton.setOnClickListener(v -> {
+            assert mNativeSmsDialogAndroid != 0;
+            SmsReceiverDialogJni.get().onConfirm(mNativeSmsDialogAndroid);
+        });
+
+        mDialog = new Dialog(mActivity);
+        mDialog.setCanceledOnTouchOutside(false);
+        mDialog.addContentView(dialogContainer,
+                new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT,
+                        LinearLayout.LayoutParams.MATCH_PARENT));
+
+        Window window = mDialog.getWindow();
+        window.setLayout(Math.round(mActivity.getWindow().getDecorView().getWidth() * 0.9f),
+                LayoutParams.WRAP_CONTENT);
+        window.setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));
+
+        mDialog.show();
+    }
+
     @VisibleForTesting
     @CalledByNative
     void destroy() {
@@ -86,11 +105,7 @@ public class SmsReceiverDialog {
 
         assert mNativeSmsDialogAndroid != 0 : "open() called after object was destroyed";
 
-        mActivity = window.getActivity().get();
-        mDialog = createDialog(mActivity, mNativeSmsDialogAndroid);
-        mDialog.show();
-        Button continueButton = mDialog.getButton(DialogInterface.BUTTON_POSITIVE);
-        continueButton.setEnabled(false);
+        createAndShowDialog(window);
     }
 
     @VisibleForTesting
@@ -108,23 +123,17 @@ public class SmsReceiverDialog {
     void smsReceived() {
         if (DEBUG) Log.d(TAG, "SmsReceiverDialog.smsReceived()");
 
-        mDialog.dismiss();
-        mDialog = createDialog(mActivity, mNativeSmsDialogAndroid);
-        Drawable smsReceivedDrawable =
-                AppCompatResources.getDrawable(mActivity, R.drawable.ic_check_circle_blue_18dp);
-        mDialog.setIndeterminateDrawable(smsReceivedDrawable);
-        mDialog.setMessage(mActivity.getText(R.string.sms_dialog_status_sms_received));
-        mDialog.show();
-
-        Button continueButton = mDialog.getButton(DialogInterface.BUTTON_POSITIVE);
-        continueButton.setEnabled(true);
+        mProgressBar.setVisibility(View.GONE);
+        mDoneIcon.setVisibility(View.VISIBLE);
+        mStatus.setText(mActivity.getText(R.string.sms_dialog_status_sms_received));
+        mConfirmButton.setEnabled(true);
     }
 
     /**
      * Returns the dialog associated with this class. For use with tests only.
      */
     @VisibleForTesting
-    ProgressDialog getDialogForTesting() {
+    Dialog getDialogForTesting() {
         return mDialog;
     }
 
@@ -136,6 +145,6 @@ public class SmsReceiverDialog {
     @NativeMethods
     interface Natives {
         void onCancel(long nativeSmsDialogAndroid);
-        void onContinue(long nativeSmsDialogAndroid);
+        void onConfirm(long nativeSmsDialogAndroid);
     }
 }

chrome/android/java/strings/android_chrome_strings.grd

@@ -4038,8 +4038,8 @@ The site does NOT gain access to the camera. The camera images are only visible
       <message name="IDS_SMS_DIALOG_STATUS_SMS_RECEIVED" desc="Message shown when Chrome has received an SMS on the user's behalf">
         Text message received
       </message>
-      <message name="IDS_SMS_DIALOG_CONTINUE_BUTTON_TEXT" desc="Label on the button that users can click to continue SMS verification by passing the incoming SMS to the site.">
-        Continue
+      <message name="IDS_SMS_DIALOG_CONFIRM_BUTTON_TEXT" desc="Label on the button that users can click to confirm SMS verification by passing the incoming SMS to the site.">
+        Confirm
       </message>
 
     </messages>

chrome/android/java/strings/android_chrome_strings_grd/IDS_SMS_DIALOG_CONFIRM_BUTTON_TEXT.png.sha1

+3851b10baa9e6cd314477667cdac69e549ba2e52
\ No newline at end of file

chrome/android/java/strings/android_chrome_strings_grd/IDS_SMS_DIALOG_CONTINUE_BUTTON_TEXT.png.sha1

-26adb12c17f0cb8e25cd09a991071751eed1434d
\ No newline at end of file

chrome/android/java/strings/android_chrome_strings_grd/IDS_SMS_DIALOG_STATUS_SMS_RECEIVED.png.sha1

-e067863e769ed41d1efb48ab2e27479e08d92e6f
+3851b10baa9e6cd314477667cdac69e549ba2e52
\ No newline at end of file

chrome/android/java/strings/android_chrome_strings_grd/IDS_SMS_DIALOG_STATUS_WAITING.png.sha1

-d63f3910bdd45cea1f0a5fcc83c9e7aa4acf9216
+9a38cd3599c74c36b46f3bf4edf565fa8280eb9d
\ No newline at end of file

chrome/android/java/strings/android_chrome_strings_grd/IDS_SMS_DIALOG_TITLE.png.sha1

-a720e515aa7361b083ffad3b584d97d42051c14f
+9a38cd3599c74c36b46f3bf4edf565fa8280eb9d
\ No newline at end of file

chrome/android/javatests/src/org/chromium/chrome/browser/sms/SmsReceiverDialogTest.java

@@ -4,11 +4,14 @@
 
 package org.chromium.chrome.browser.sms;
 
-import android.app.ProgressDialog;
-import android.content.DialogInterface;
+import android.app.Dialog;
 import android.support.test.InstrumentationRegistry;
 import android.support.test.filters.LargeTest;
+import android.view.View;
 import android.widget.Button;
+import android.widget.ImageView;
+import android.widget.ProgressBar;
+import android.widget.TextView;
 
 import org.junit.Assert;
 import org.junit.Before;
@@ -19,6 +22,7 @@ import org.junit.runner.RunWith;
 import org.chromium.base.test.util.CallbackHelper;
 import org.chromium.base.test.util.CommandLineFlags;
 import org.chromium.base.test.util.JniMocker;
+import org.chromium.chrome.R;
 import org.chromium.chrome.browser.ChromeActivity;
 import org.chromium.chrome.browser.ChromeSwitches;
 import org.chromium.chrome.test.ChromeActivityTestRule;
@@ -44,7 +48,7 @@ public class SmsReceiverDialogTest {
     private SmsReceiverDialog mSmsDialog;
 
     final private CallbackHelper mCancelButtonClickedCallback = new CallbackHelper();
-    final private CallbackHelper mContinueButtonClickedCallback = new CallbackHelper();
+    final private CallbackHelper mConfirmButtonClickedCallback = new CallbackHelper();
 
     private class TestSmsReceiverDialogJni implements SmsReceiverDialog.Natives {
         @Override
@@ -53,8 +57,8 @@ public class SmsReceiverDialogTest {
         }
 
         @Override
-        public void onContinue(long nativeSmsDialogAndroid) {
-            mContinueButtonClickedCallback.notifyCalled();
+        public void onConfirm(long nativeSmsDialogAndroid) {
+            mConfirmButtonClickedCallback.notifyCalled();
         }
     }
 
@@ -76,25 +80,24 @@ public class SmsReceiverDialogTest {
 
     @Test
     @LargeTest
-    public void testCancelButtonAndContinueButton() {
-        ProgressDialog dialog = mSmsDialog.getDialogForTesting();
-        Button cancelButton = dialog.getButton(DialogInterface.BUTTON_NEGATIVE);
+    public void testCancelButtonAndConfirmButton() {
+        Dialog dialog = mSmsDialog.getDialogForTesting();
+
+        Button cancelButton = (Button) dialog.findViewById(R.id.cancel_button);
         Assert.assertTrue(cancelButton.isEnabled());
 
-        Button continueButton = dialog.getButton(DialogInterface.BUTTON_POSITIVE);
-        Assert.assertFalse(continueButton.isEnabled());
+        Button confirmButton = (Button) dialog.findViewById(R.id.confirm_button);
+        Assert.assertFalse(confirmButton.isEnabled());
 
         TestThreadUtils.runOnUiThreadBlocking(mSmsDialog::smsReceived);
-        Assert.assertTrue(mSmsDialog.getDialogForTesting()
-                                  .getButton(DialogInterface.BUTTON_POSITIVE)
-                                  .isEnabled());
+        Assert.assertTrue(confirmButton.isEnabled());
     }
 
     @Test
     @LargeTest
     public void testClickCancelButton() throws Throwable {
-        ProgressDialog dialog = mSmsDialog.getDialogForTesting();
-        Button cancelButton = dialog.getButton(DialogInterface.BUTTON_NEGATIVE);
+        Dialog dialog = mSmsDialog.getDialogForTesting();
+        Button cancelButton = (Button) dialog.findViewById(R.id.cancel_button);
 
         TestTouchUtils.performClickOnMainSync(
                 InstrumentationRegistry.getInstrumentation(), cancelButton);
@@ -104,20 +107,44 @@ public class SmsReceiverDialogTest {
 
     @Test
     @LargeTest
-    public void testClickContinueButton() throws Throwable {
-        ProgressDialog dialog = mSmsDialog.getDialogForTesting();
-        Button continueButton = dialog.getButton(DialogInterface.BUTTON_POSITIVE);
+    public void testClickConfirmButton() throws Throwable {
+        Dialog dialog = mSmsDialog.getDialogForTesting();
+        Button confirmButton = (Button) dialog.findViewById(R.id.confirm_button);
 
         TestTouchUtils.performClickOnMainSync(
-                InstrumentationRegistry.getInstrumentation(), continueButton);
+                InstrumentationRegistry.getInstrumentation(), confirmButton);
+
+        mConfirmButtonClickedCallback.waitForCallback(0, 1);
+    }
+
+    @Test
+    @LargeTest
+    public void testStatusRowChangesWhenMessageReceived() {
+        Dialog dialog = mSmsDialog.getDialogForTesting();
+
+        ProgressBar progressBar = (ProgressBar) dialog.findViewById(R.id.progress);
+        ImageView doneIcon = (ImageView) dialog.findViewById(R.id.done_icon);
+        TextView status = (TextView) dialog.findViewById(R.id.status);
+
+        Assert.assertEquals(View.VISIBLE, progressBar.getVisibility());
+        Assert.assertEquals(View.GONE, doneIcon.getVisibility());
+        Assert.assertEquals(
+                mActivityTestRule.getActivity().getString(R.string.sms_dialog_status_waiting),
+                status.getText().toString());
+
+        TestThreadUtils.runOnUiThreadBlocking(mSmsDialog::smsReceived);
 
-        mContinueButtonClickedCallback.waitForCallback(0, 1);
+        Assert.assertEquals(View.GONE, progressBar.getVisibility());
+        Assert.assertEquals(View.VISIBLE, doneIcon.getVisibility());
+        Assert.assertEquals(
+                mActivityTestRule.getActivity().getString(R.string.sms_dialog_status_sms_received),
+                status.getText().toString());
     }
 
     @Test
     @LargeTest
     public void testDialogClose() {
-        ProgressDialog dialog = mSmsDialog.getDialogForTesting();
+        Dialog dialog = mSmsDialog.getDialogForTesting();
         Assert.assertTrue(dialog.isShowing());
 
         TestThreadUtils.runOnUiThreadBlocking(mSmsDialog::close);

chrome/browser/ui/android/sms/sms_dialog_android.cc

@@ -25,9 +25,9 @@ SmsDialogAndroid::~SmsDialogAndroid() {
 }
 
 void SmsDialogAndroid::Open(content::RenderFrameHost* host,
-                            base::OnceClosure on_continue,
+                            base::OnceClosure on_confirm,
                             base::OnceClosure on_cancel) {
-  on_continue_ = std::move(on_continue);
+  on_confirm_ = std::move(on_confirm);
   on_cancel_ = std::move(on_cancel);
 
   content::WebContents* web_contents =
@@ -48,8 +48,8 @@ void SmsDialogAndroid::SmsReceived() {
   Java_SmsReceiverDialog_smsReceived(AttachCurrentThread(), java_dialog_);
 }
 
-void SmsDialogAndroid::OnContinue(JNIEnv* env) {
-  std::move(on_continue_).Run();
+void SmsDialogAndroid::OnConfirm(JNIEnv* env) {
+  std::move(on_confirm_).Run();
 }
 
 void SmsDialogAndroid::OnCancel(JNIEnv* env) {

chrome/browser/ui/android/sms/sms_dialog_android.h

@@ -16,20 +16,20 @@ class SmsDialogAndroid : public content::SmsDialog {
   ~SmsDialogAndroid() override;
 
   void Open(content::RenderFrameHost*,
-            base::OnceClosure on_continue,
+            base::OnceClosure on_confirm,
             base::OnceClosure on_cancel) override;
   void Close() override;
   void SmsReceived() override;
 
-  // Report the user manually clicks the 'Continue' button.
-  void OnContinue(JNIEnv* env);
+  // Report the user manually clicks the 'Confirm' button.
+  void OnConfirm(JNIEnv* env);
 
   // Report the user manually dismisses the SMS dialog.
   void OnCancel(JNIEnv* env);
 
  private:
   base::android::ScopedJavaGlobalRef<jobject> java_dialog_;
-  base::OnceClosure on_continue_;
+  base::OnceClosure on_confirm_;
   base::OnceClosure on_cancel_;
   DISALLOW_COPY_AND_ASSIGN(SmsDialogAndroid);
 };

content/browser/sms/sms_browsertest.cc

@@ -108,22 +108,21 @@ IN_PROC_BROWSER_TEST_F(SmsBrowserTest, Receive) {
 
   auto* dialog = new NiceMock<MockSmsDialog>();
 
-  base::OnceClosure on_continue_callback;
+  base::OnceClosure on_confirm_callback;
 
   EXPECT_CALL(delegate_, CreateSmsDialog())
       .WillOnce(Return(ByMove(base::WrapUnique(dialog))));
 
   EXPECT_CALL(*dialog, Open(_, _, _))
-      .WillOnce(Invoke([&on_continue_callback](content::RenderFrameHost*,
-                                               base::OnceClosure on_continue,
-                                               base::OnceClosure on_cancel) {
-        on_continue_callback = std::move(on_continue);
+      .WillOnce(Invoke([&on_confirm_callback](content::RenderFrameHost*,
+                                              base::OnceClosure on_confirm,
+                                              base::OnceClosure on_cancel) {
+        on_confirm_callback = std::move(on_confirm);
       }));
 
-  EXPECT_CALL(*dialog, SmsReceived())
-      .WillOnce(Invoke([&on_continue_callback]() {
-        std::move(on_continue_callback).Run();
-      }));
+  EXPECT_CALL(*dialog, SmsReceived()).WillOnce(Invoke([&on_confirm_callback]() {
+    std::move(on_confirm_callback).Run();
+  }));
 
   auto* provider = new NiceMock<MockSmsProvider>();
   BrowserMainLoop::GetInstance()->SetSmsProviderForTesting(
@@ -154,22 +153,21 @@ IN_PROC_BROWSER_TEST_F(SmsBrowserTest, AtMostOnePendingSmsRequest) {
 
   auto* dialog = new NiceMock<MockSmsDialog>();
 
-  base::OnceClosure on_continue_callback;
+  base::OnceClosure on_confirm_callback;
 
   EXPECT_CALL(delegate_, CreateSmsDialog())
       .WillOnce(Return(ByMove(base::WrapUnique(dialog))));
 
   EXPECT_CALL(*dialog, Open(_, _, _))
-      .WillOnce(Invoke([&on_continue_callback](content::RenderFrameHost*,
-                                               base::OnceClosure on_continue,
-                                               base::OnceClosure on_cancel) {
-        on_continue_callback = std::move(on_continue);
+      .WillOnce(Invoke([&on_confirm_callback](content::RenderFrameHost*,
+                                              base::OnceClosure on_confirm,
+                                              base::OnceClosure on_cancel) {
+        on_confirm_callback = std::move(on_confirm);
       }));
 
-  EXPECT_CALL(*dialog, SmsReceived())
-      .WillOnce(Invoke([&on_continue_callback]() {
-        std::move(on_continue_callback).Run();
-      }));
+  EXPECT_CALL(*dialog, SmsReceived()).WillOnce(Invoke([&on_confirm_callback]() {
+    std::move(on_confirm_callback).Run();
+  }));
 
   auto* provider = new NiceMock<MockSmsProvider>();
   BrowserMainLoop::GetInstance()->SetSmsProviderForTesting(
@@ -282,7 +280,7 @@ IN_PROC_BROWSER_TEST_F(SmsBrowserTest, TwoTabsSameOrigin) {
     true
   )";
 
-  base::OnceClosure on_continue1, on_continue2;
+  base::OnceClosure on_confirm1, on_confirm2;
 
   {
     base::RunLoop loop;
@@ -299,10 +297,10 @@ IN_PROC_BROWSER_TEST_F(SmsBrowserTest, TwoTabsSameOrigin) {
     }));
 
     EXPECT_CALL(*dialog, Open(_, _, _))
-        .WillOnce(Invoke([&on_continue1](content::RenderFrameHost*,
-                                         base::OnceClosure on_continue,
-                                         base::OnceClosure on_cancel) {
-          on_continue1 = std::move(on_continue);
+        .WillOnce(Invoke([&on_confirm1](content::RenderFrameHost*,
+                                        base::OnceClosure on_confirm,
+                                        base::OnceClosure on_cancel) {
+          on_confirm1 = std::move(on_confirm);
         }));
 
     // First tab registers an observer.
@@ -326,10 +324,10 @@ IN_PROC_BROWSER_TEST_F(SmsBrowserTest, TwoTabsSameOrigin) {
     }));
 
     EXPECT_CALL(*dialog, Open(_, _, _))
-        .WillOnce(Invoke([&on_continue2](content::RenderFrameHost*,
-                                         base::OnceClosure on_continue,
-                                         base::OnceClosure on_cancel) {
-          on_continue2 = std::move(on_continue);
+        .WillOnce(Invoke([&on_confirm2](content::RenderFrameHost*,
+                                        base::OnceClosure on_confirm,
+                                        base::OnceClosure on_cancel) {
+          on_confirm2 = std::move(on_confirm);
         }));
 
     // Second tab registers an observer.
@@ -342,7 +340,7 @@ IN_PROC_BROWSER_TEST_F(SmsBrowserTest, TwoTabsSameOrigin) {
 
   provider->NotifyReceive(url::Origin::Create(url), "hello1");
 
-  std::move(on_continue1).Run();
+  std::move(on_confirm1).Run();
 
   EXPECT_EQ("hello1", EvalJs(tab1, "sms"));
 
@@ -350,7 +348,7 @@ IN_PROC_BROWSER_TEST_F(SmsBrowserTest, TwoTabsSameOrigin) {
 
   provider->NotifyReceive(url::Origin::Create(url), "hello2");
 
-  std::move(on_continue2).Run();
+  std::move(on_confirm2).Run();
 
   EXPECT_EQ("hello2", EvalJs(tab2, "sms"));
 
@@ -394,25 +392,25 @@ IN_PROC_BROWSER_TEST_F(SmsBrowserTest, TwoTabsDifferentOrigin) {
   auto* dialog1 = new NiceMock<MockSmsDialog>();
   auto* dialog2 = new NiceMock<MockSmsDialog>();
 
-  base::OnceClosure on_continue_callback1;
-  base::OnceClosure on_continue_callback2;
+  base::OnceClosure on_confirm_callback1;
+  base::OnceClosure on_confirm_callback2;
 
   EXPECT_CALL(delegate_, CreateSmsDialog())
       .WillOnce(Return(ByMove(base::WrapUnique(dialog1))))
       .WillOnce(Return(ByMove(base::WrapUnique(dialog2))));
 
   EXPECT_CALL(*dialog1, Open(_, _, _))
-      .WillOnce(Invoke([&on_continue_callback1](content::RenderFrameHost*,
-                                                base::OnceClosure on_continue,
-                                                base::OnceClosure on_cancel) {
-        on_continue_callback1 = std::move(on_continue);
+      .WillOnce(Invoke([&on_confirm_callback1](content::RenderFrameHost*,
+                                               base::OnceClosure on_confirm,
+                                               base::OnceClosure on_cancel) {
+        on_confirm_callback1 = std::move(on_confirm);
       }));
 
   EXPECT_CALL(*dialog2, Open(_, _, _))
-      .WillOnce(Invoke([&on_continue_callback2](content::RenderFrameHost*,
-                                                base::OnceClosure on_continue,
-                                                base::OnceClosure on_cancel) {
-        on_continue_callback2 = std::move(on_continue);
+      .WillOnce(Invoke([&on_confirm_callback2](content::RenderFrameHost*,
+                                               base::OnceClosure on_confirm,
+                                               base::OnceClosure on_cancel) {
+        on_confirm_callback2 = std::move(on_confirm);
       }));
 
   EXPECT_EQ(true, EvalJs(tab1, script));
@@ -424,7 +422,7 @@ IN_PROC_BROWSER_TEST_F(SmsBrowserTest, TwoTabsDifferentOrigin) {
 
   provider->NotifyReceive(url::Origin::Create(url1), "hello1");
 
-  std::move(on_continue_callback1).Run();
+  std::move(on_confirm_callback1).Run();
 
   EXPECT_EQ("hello1", EvalJs(tab1, "sms"));
 
@@ -432,7 +430,7 @@ IN_PROC_BROWSER_TEST_F(SmsBrowserTest, TwoTabsDifferentOrigin) {
 
   provider->NotifyReceive(url::Origin::Create(url2), "hello2");
 
-  std::move(on_continue_callback2).Run();
+  std::move(on_confirm_callback2).Run();
 
   EXPECT_EQ("hello2", EvalJs(tab2, "sms"));
 
@@ -486,7 +484,7 @@ IN_PROC_BROWSER_TEST_F(SmsBrowserTest, Cancels) {
 
   EXPECT_CALL(*dialog, Open(_, _, _))
       .WillOnce(
-          Invoke([](content::RenderFrameHost*, base::OnceClosure on_continue,
+          Invoke([](content::RenderFrameHost*, base::OnceClosure on_confirm,
                     base::OnceClosure on_cancel) {
             // Simulates the user pressing "cancel".
             std::move(on_cancel).Run();

content/browser/sms/sms_service.cc

@@ -116,7 +116,7 @@ void SmsService::OnTimeout() {
   Dismiss();
 }
 
-void SmsService::OnContinue() {
+void SmsService::OnConfirm() {
   DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
 
   DCHECK(sms_);
@@ -145,7 +145,7 @@ void SmsService::Prompt() {
   if (prompt_) {
     prompt_->Open(
         render_frame_host(),
-        base::BindOnce(&SmsService::OnContinue, base::Unretained(this)),
+        base::BindOnce(&SmsService::OnConfirm, base::Unretained(this)),
         base::BindOnce(&SmsService::OnCancel, base::Unretained(this)));
   }
 }

content/browser/sms/sms_service.h

@@ -60,8 +60,8 @@ class CONTENT_EXPORT SmsService
 
   // Callback when the |timer_| times out.
   void OnTimeout();
-  // Callback when the user manually clicks 'Continue' button.
-  void OnContinue();
+  // Callback when the user manually clicks 'Confirm' button.
+  void OnConfirm();
   // Callback when the user manually dismisses the dialog.
   void OnCancel();
 

content/browser/sms/sms_service_unittest.cc

@@ -127,15 +127,15 @@ class Service {
 
     EXPECT_CALL(*dialog, Open(rfh, _, _))
         .WillOnce(
-            Invoke([&](content::RenderFrameHost*, base::OnceClosure on_continue,
+            Invoke([&](content::RenderFrameHost*, base::OnceClosure on_confirm,
                        base::OnceClosure on_cancel) {
-              on_continue_callback_ = std::move(on_continue);
+              on_confirm_callback_ = std::move(on_confirm);
             }));
 
     EXPECT_CALL(*dialog, SmsReceived()).WillOnce(Invoke([&]() {
-      // Simulates user clicking the "Continue" button to verify received
+      // Simulates user clicking the "Confirm" button to verify received
       // sms.
-      std::move(on_continue_callback_).Run();
+      std::move(on_confirm_callback_).Run();
     }));
 
     EXPECT_CALL(*dialog, Close()).WillOnce(Return());
@@ -154,7 +154,7 @@ class Service {
   NiceMock<MockSmsProvider> provider_;
   blink::mojom::SmsReceiverPtr service_ptr_;
   std::unique_ptr<SmsService> service_;
-  base::OnceClosure on_continue_callback_;
+  base::OnceClosure on_confirm_callback_;
 };
 
 class SmsServiceTest : public RenderViewHostTestHarness {
@@ -484,7 +484,7 @@ TEST_F(SmsServiceTest, Cancel) {
 
   EXPECT_CALL(*dialog, Open(main_rfh(), _, _))
       .WillOnce(
-          Invoke([](content::RenderFrameHost*, base::OnceClosure on_continue,
+          Invoke([](content::RenderFrameHost*, base::OnceClosure on_confirm,
                     base::OnceClosure on_cancel) {
             // Simulates the user pressing "Cancel".
             std::move(on_cancel).Run();
@@ -537,25 +537,24 @@ TEST_F(SmsServiceTest, SecondRequestTimesOutEarlierThanFirstRequest) {
   auto* dialog1 = new NiceMock<MockSmsDialog>();
   auto* dialog2 = new NiceMock<MockSmsDialog>();
 
-  base::OnceClosure on_continue_callback;
+  base::OnceClosure on_confirm_callback;
 
   EXPECT_CALL(*service.delegate(), CreateSmsDialog())
       .WillOnce(Return(ByMove(base::WrapUnique(dialog1))))
       .WillOnce(Return(ByMove(base::WrapUnique(dialog2))));
 
   EXPECT_CALL(*dialog1, Open(main_rfh(), _, _))
-      .WillOnce(Invoke([&on_continue_callback](content::RenderFrameHost*,
-                                               base::OnceClosure on_continue,
-                                               base::OnceClosure on_cancel) {
-        on_continue_callback = std::move(on_continue);
+      .WillOnce(Invoke([&on_confirm_callback](content::RenderFrameHost*,
+                                              base::OnceClosure on_confirm,
+                                              base::OnceClosure on_cancel) {
+        on_confirm_callback = std::move(on_confirm);
       }));
 
   EXPECT_CALL(*dialog2, Open(main_rfh(), _, _)).Times(1);
 
   EXPECT_CALL(*dialog1, SmsReceived())
-      .WillOnce(Invoke([&on_continue_callback]() {
-        std::move(on_continue_callback).Run();
-      }));
+      .WillOnce(Invoke(
+          [&on_confirm_callback]() { std::move(on_confirm_callback).Run(); }));
 
   EXPECT_CALL(*service.provider(), Retrieve())
       .WillOnce(Invoke([&service]() {
@@ -641,7 +640,7 @@ TEST_F(SmsServiceTest, RecordCancelOnSuccessTimeMetric) {
 
     EXPECT_CALL(*dialog, Open(main_rfh(), _, _))
         .WillOnce(
-            Invoke([](content::RenderFrameHost*, base::OnceClosure on_continue,
+            Invoke([](content::RenderFrameHost*, base::OnceClosure on_confirm,
                       base::OnceClosure on_cancel) {
               // Simulates the user pressing "Cancel".
               std::move(on_cancel).Run();
@@ -678,7 +677,7 @@ TEST_F(SmsServiceTest, RecordCancelOnSuccessTimeMetric) {
 
     EXPECT_CALL(*dialog, Open(main_rfh(), _, _))
         .WillOnce(Invoke([&on_cancel_callback](content::RenderFrameHost*,
-                                               base::OnceClosure on_continue,
+                                               base::OnceClosure on_confirm,
                                                base::OnceClosure on_cancel) {
           on_cancel_callback = std::move(on_cancel);
         }));

content/public/browser/sms_dialog.h

@@ -19,7 +19,7 @@ class CONTENT_EXPORT SmsDialog {
   SmsDialog() = default;
   virtual ~SmsDialog() = default;
   virtual void Open(content::RenderFrameHost* host,
-                    base::OnceClosure on_continue,
+                    base::OnceClosure on_confirm,
                     base::OnceClosure on_cancel) = 0;
   virtual void Close() = 0;
   virtual void SmsReceived() = 0;