[Android][WebSignin] Use OnClickListener for listener property keys

This CL replaces the Runnable type with OnClickListener type for
listener property keys to make the code more readable.

No behavior change for this CL.

Bug: 1124737
Change-Id: I06e5634f68891d52917603fe6ce9fa61f479bd67
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2390911Reviewed-by: Tanmoy Mollik <triploblastic@chromium.org>
Commit-Queue: Alice Wang <aliceywang@chromium.org>
Cr-Commit-Position: refs/heads/master@{#804705}

chrome/android/java/src/org/chromium/chrome/browser/signin/account_picker/AccountPickerBottomSheetProperties.java

@@ -4,6 +4,8 @@
 
 package org.chromium.chrome.browser.signin.account_picker;
 
+import android.view.View.OnClickListener;
+
 import androidx.annotation.IntDef;
 
 import org.chromium.chrome.browser.signin.DisplayableProfileData;
@@ -102,14 +104,14 @@ class AccountPickerBottomSheetProperties {
     // PropertyKeys for the selected account view when the account list is collapsed.
     // The selected account view is replaced by account list view when the
     // account list is expanded.
-    static final ReadableObjectPropertyKey<Runnable> ON_SELECTED_ACCOUNT_CLICKED =
+    static final ReadableObjectPropertyKey<OnClickListener> ON_SELECTED_ACCOUNT_CLICKED =
             new ReadableObjectPropertyKey<>("on_selected_account_clicked");
     static final WritableObjectPropertyKey<DisplayableProfileData> SELECTED_ACCOUNT_DATA =
             new WritableObjectPropertyKey<>("selected_account_data");
 
     // PropertyKey for the button |Continue as ...|
     // The button is visible during all the lifecycle of the bottom sheet
-    static final ReadableObjectPropertyKey<Runnable> ON_CONTINUE_AS_CLICKED =
+    static final ReadableObjectPropertyKey<OnClickListener> ON_CONTINUE_AS_CLICKED =
             new ReadableObjectPropertyKey<>("on_continue_as_clicked");
 
     // PropertyKey indicates the view state of the account picker bottom sheet
@@ -127,9 +129,9 @@ class AccountPickerBottomSheetProperties {
     static PropertyModel createModel(
             Runnable onSelectedAccountClicked, Runnable onContinueAsClicked) {
         return new PropertyModel.Builder(ALL_KEYS)
-                .with(ON_SELECTED_ACCOUNT_CLICKED, onSelectedAccountClicked)
+                .with(ON_SELECTED_ACCOUNT_CLICKED, v -> onSelectedAccountClicked.run())
                 .with(SELECTED_ACCOUNT_DATA, null)
-                .with(ON_CONTINUE_AS_CLICKED, onContinueAsClicked)
+                .with(ON_CONTINUE_AS_CLICKED, v -> onContinueAsClicked.run())
                 .with(VIEW_STATE, ViewState.NO_ACCOUNTS)
                 .build();
     }

chrome/android/java/src/org/chromium/chrome/browser/signin/account_picker/AccountPickerBottomSheetViewBinder.java

@@ -16,9 +16,8 @@ class AccountPickerBottomSheetViewBinder {
     static void bind(
             PropertyModel model, AccountPickerBottomSheetView view, PropertyKey propertyKey) {
         if (propertyKey == AccountPickerBottomSheetProperties.ON_SELECTED_ACCOUNT_CLICKED) {
-            view.getSelectedAccountView().setOnClickListener(v -> {
-                model.get(AccountPickerBottomSheetProperties.ON_SELECTED_ACCOUNT_CLICKED).run();
-            });
+            view.getSelectedAccountView().setOnClickListener(
+                    model.get(AccountPickerBottomSheetProperties.ON_SELECTED_ACCOUNT_CLICKED));
         } else if (propertyKey == AccountPickerBottomSheetProperties.VIEW_STATE) {
             @ViewState
             int viewState = model.get(AccountPickerBottomSheetProperties.VIEW_STATE);
@@ -30,9 +29,8 @@ class AccountPickerBottomSheetViewBinder {
                 view.updateSelectedAccount(profileData);
             }
         } else if (propertyKey == AccountPickerBottomSheetProperties.ON_CONTINUE_AS_CLICKED) {
-            view.getContinueAsButton().setOnClickListener(v -> {
-                model.get(AccountPickerBottomSheetProperties.ON_CONTINUE_AS_CLICKED).run();
-            });
+            view.getContinueAsButton().setOnClickListener(
+                    model.get(AccountPickerBottomSheetProperties.ON_CONTINUE_AS_CLICKED));
         }
     }