[Autofill Assistant] Added |size_in_pixel| dimension in ClientDimensionProto

Bug: b/171025821
Change-Id: I8cee9bdce4f72e670dfe6e34e0c77bcf59baa8de
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2502689Reviewed-by: Clemens Arbesser <arbesser@google.com>
Commit-Queue: Rahul Goyal <goyalrahul@google.com>
Cr-Commit-Position: refs/heads/master@{#821394}

chrome/android/features/autofill_assistant/javatests/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantOverlayIntegrationTest.java

@@ -444,7 +444,7 @@ public class AutofillAssistantOverlayIntegrationTest {
     public void testShowImageOnOverlay() throws Exception {
         String redDotBase64Url =
                 "data:image/png;base64, iVBORw0KGgoAAAANSUhEUgAAAAUAAAAFCAYAAACNbyblAAAAHElEQVQI12P4//8/w38GIAXDIBKE0DHxgljNBAAO9TXL0Y4OHwAAAABJRU5ErkJggg==";
-        int imageSize = 50;
+        int imageSizeInPixel = 50;
         ClientSettingsProto clientSettings =
                 (ClientSettingsProto) ClientSettingsProto.newBuilder()
                         .setOverlayImage(
@@ -453,11 +453,15 @@ public class AutofillAssistantOverlayIntegrationTest {
                                                 BitmapDrawableProto.newBuilder()
                                                         .setUrl(redDotBase64Url)
                                                         .setWidth(ClientDimensionProto.newBuilder()
-                                                                          .setDp(imageSize))
-                                                        .setHeight(ClientDimensionProto.newBuilder()
-                                                                           .setDp(imageSize))))
+                                                                          .setSizeInPixel(
+                                                                                  imageSizeInPixel))
+                                                        .setHeight(
+                                                                ClientDimensionProto.newBuilder()
+                                                                        .setSizeInPixel(
+                                                                                imageSizeInPixel))))
                                         .setImageSize(
-                                                ClientDimensionProto.newBuilder().setDp(imageSize)))
+                                                ClientDimensionProto.newBuilder().setSizeInPixel(
+                                                        imageSizeInPixel)))
                         .build();
 
         AutofillAssistantTestScript script = new AutofillAssistantTestScript(
@@ -483,7 +487,7 @@ public class AutofillAssistantOverlayIntegrationTest {
                                         .getRootUiCoordinatorForTesting()
                                         .getBrowserControlsManager()
                                         .getContentOffset();
-        int image_center_y = yTopContentOffset + imageSize / 2;
+        int image_center_y = yTopContentOffset + imageSizeInPixel / 2;
 
         // Testing that central pixel of overlay image is different from (0,0) pixel
         waitUntil(()

chrome/browser/android/autofill_assistant/ui_controller_android_utils.cc

@@ -107,15 +107,14 @@ base::Optional<int> GetPixelSize(
   switch (proto.size_case()) {
     case ClientDimensionProto::kDp:
       return Java_AssistantDimension_getPixelSizeDp(env, jcontext, proto.dp());
-      break;
     case ClientDimensionProto::kWidthFactor:
       return Java_AssistantDimension_getPixelSizeWidthFactor(
           env, jcontext, proto.width_factor());
-      break;
     case ClientDimensionProto::kHeightFactor:
       return Java_AssistantDimension_getPixelSizeHeightFactor(
           env, jcontext, proto.height_factor());
-      break;
+    case ClientDimensionProto::kSizeInPixel:
+      return proto.size_in_pixel();
     case ClientDimensionProto::SIZE_NOT_SET:
       return base::nullopt;
   }

components/autofill_assistant/browser/view_layout.proto

@@ -54,6 +54,7 @@ message ClientDimensionProto {
     float width_factor = 2;
     // Factor to multiply with the client's total height.
     float height_factor = 3;
+    int32 size_in_pixel = 4;
   }
 }