[Android][WebSignin] Use correct icon for sign-in general error

This CL uses correct warning icon for sign-in general error and adds
render tests for the sign-in general error view.

Bug: 1120308
Change-Id: Ie25b8be7fca803ea49dfbc855dac41bc2bd89f8e
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2379751Reviewed-by: Boris Sazonov <bsazonov@chromium.org>
Commit-Queue: Alice Wang <aliceywang@chromium.org>
Cr-Commit-Position: refs/heads/master@{#803163}

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

@@ -141,6 +141,7 @@ class AccountPickerBottomSheetView implements BottomSheetContent {
      * Sets up the sign-in in progress view.
      */
     void setUpSignInInProgressView() {
+        mLogoImage.setImageResource(R.drawable.chrome_sync_logo);
         mAccountPickerTitle.setText(R.string.signin_account_picker_bottom_sheet_signin_title);
         mAccountPickerSubtitle.setVisibility(View.INVISIBLE);
         // Set the account picker subtitle text in case there's an error.
@@ -168,6 +169,7 @@ class AccountPickerBottomSheetView implements BottomSheetContent {
      * Sets up the view for sign-in general error.
      */
     void setUpSignInGeneralErrorView() {
+        mLogoImage.setImageResource(R.drawable.ic_warning_red_24dp);
         mAccountPickerTitle.setText(R.string.signin_account_picker_bottom_sheet_error_title);
         mAccountPickerSubtitle.setText(R.string.signin_account_picker_general_error_subtitle);
         mAccountPickerSubtitle.setVisibility(View.VISIBLE);

chrome/android/javatests/src/org/chromium/chrome/browser/signin/AccountPickerBottomSheetRenderTest.java

@@ -166,6 +166,28 @@ public class AccountPickerBottomSheetRenderTest {
         clickContinueButtonAndCheckSigninInProgressView();
     }
 
+    @Test
+    @MediumTest
+    @Feature("RenderTest")
+    @ParameterAnnotations.UseMethodParameter(NightModeTestUtils.NightModeParams.class)
+    public void testSigninGeneralErrorView(boolean nightModeEnabled) throws IOException {
+        mAccountManagerTestRule.addAccount(PROFILE_DATA1);
+        CoreAccountInfo coreAccountInfo =
+                mAccountManagerTestRule.toCoreAccountInfo(PROFILE_DATA1.getAccountName());
+        // Throws a connection error during the sign-in action
+        doAnswer(invocation -> {
+            Callback<GoogleServiceAuthError> onSignInErrorCallback = invocation.getArgument(1);
+            onSignInErrorCallback.onResult(new GoogleServiceAuthError(State.CONNECTION_FAILED));
+            return null;
+        })
+                .when(mAccountPickerDelegateMock)
+                .signIn(eq(coreAccountInfo), any());
+        buildAndShowCollapsedBottomSheet();
+        clickContinueButtonAndWaitForErrorView();
+        mRenderTestRule.render(
+                mCoordinator.getBottomSheetViewForTesting(), "signin_general_error_sheet");
+    }
+
     private void clickContinueButtonAndWaitForErrorView() {
         View bottomSheetView = mCoordinator.getBottomSheetViewForTesting();
         TestThreadUtils.runOnUiThreadBlocking(() -> {