Fixing autofill assistant module resource references

These resources will not be available at runtime according to
crbug.com/948234.

TBR: jdemeulenaere
Bug: 948234, 973431
Change-Id: Ib4bdf649ef8cee0821469154845d746f55435c42
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1656009
Commit-Queue: Sam Maier <smaier@chromium.org>
Commit-Queue: Becky Zhou <huayinz@chromium.org>
Auto-Submit: Sam Maier <smaier@chromium.org>
Reviewed-by: Becky Zhou <huayinz@chromium.org>
Cr-Commit-Position: refs/heads/master@{#668451}

chrome/android/features/autofill_assistant/java/src/org/chromium/chrome/browser/autofill_assistant/AssistantBottomBarCoordinator.java

@@ -123,8 +123,8 @@ class AssistantBottomBarCoordinator
         // Set children top margins to have a spacing between them.
         int childSpacing = activity.getResources().getDimensionPixelSize(
                 R.dimen.autofill_assistant_bottombar_vertical_spacing);
-        int suggestionsVerticalInset =
-                activity.getResources().getDimensionPixelSize(R.dimen.chip_bg_vertical_inset);
+        int suggestionsVerticalInset = activity.getResources().getDimensionPixelSize(
+                org.chromium.chrome.R.dimen.chip_bg_vertical_inset);
         setChildMarginTop(mDetailsCoordinator.getView(), childSpacing);
         setChildMarginTop(mPaymentRequestCoordinator.getView(), childSpacing);
         setChildMarginTop(mFormCoordinator.getView(), childSpacing);

chrome/android/features/autofill_assistant/java/src/org/chromium/chrome/browser/autofill_assistant/AssistantPeekHeightCoordinator.java

@@ -88,8 +88,8 @@ class AssistantPeekHeightCoordinator {
                 R.dimen.autofill_assistant_progress_bar_height);
         mChildrenVerticalSpacing = context.getResources().getDimensionPixelSize(
                 R.dimen.autofill_assistant_bottombar_vertical_spacing);
-        mSuggestionsVerticalInset =
-                context.getResources().getDimensionPixelSize(R.dimen.chip_bg_vertical_inset);
+        mSuggestionsVerticalInset = context.getResources().getDimensionPixelSize(
+                org.chromium.chrome.R.dimen.chip_bg_vertical_inset);
 
         // Show only actions if we are in the peek state and peek mode is HANDLE_HEADER_CAROUSELS.
         bottomSheet.addObserver(new EmptyBottomSheetObserver() {

chrome/android/features/autofill_assistant/java/src/org/chromium/chrome/browser/autofill_assistant/carousel/AssistantActionsCarouselCoordinator.java

@@ -53,15 +53,14 @@ public class AssistantActionsCarouselCoordinator implements AssistantCarouselCoo
         // add this space above and below each chip, and remove the vertical inset added to all
         // ButtonView's.
         mView.setLayoutParams(new ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT,
-                context.getResources().getDimensionPixelSize(R.dimen.min_touch_target_size)
+                context.getResources().getDimensionPixelSize(
+                        org.chromium.chrome.R.dimen.min_touch_target_size)
                         + 2
                                 * context.getResources().getDimensionPixelSize(
-                                        org.chromium.chrome.autofill_assistant.R.dimen
-                                                .autofill_assistant_bottombar_vertical_spacing)
+                                        R.dimen.autofill_assistant_bottombar_vertical_spacing)
                         - 2
                                 * context.getResources().getDimensionPixelSize(
-                                        org.chromium.chrome.autofill_assistant.R.dimen
-                                                .autofill_assistant_button_bg_vertical_inset)));
+                                        R.dimen.autofill_assistant_button_bg_vertical_inset)));
 
         mView.setAdapter(new RecyclerViewAdapter<>(
                 new SimpleRecyclerViewMcp<>(model.getChipsModel(),