[Upstream] Use DISTANCE_BUBBLE_PREFERRED_WIDTH in the credit card upload bubble

Bug: 800997
Change-Id: I568a3038fbc1874a148199daaf1cd5f8b416ef5f
Reviewed-on: https://chromium-review.googlesource.com/879170
Reviewed-by: Evan Stade <estade@chromium.org>
Commit-Queue: Jared Saul <jsaul@google.com>
Cr-Original-Commit-Position: refs/heads/master@{#530996}(cherry picked from commit 8d2fb44)
Reviewed-on: https://chromium-review.googlesource.com/884325
Reviewed-by: Jared Saul <jsaul@google.com>
Cr-Commit-Position: refs/branch-heads/3325@{#67}
Cr-Branched-From: bc084a8-refs/heads/master@{#530369}

Author: Jared Saul

chrome/browser/flag_descriptions.cc

@@ -288,10 +288,10 @@ const char kEnableAutofillCreditCardUploadCvcPromptDescription[] =
     "Google Payments.";
 
 const char kEnableAutofillCreditCardUploadGooglePayBrandingName[] =
-    "Show the Google Pay logo when offering credit card upload";
+    "Enable Google Pay branding when offering credit card upload";
 const char kEnableAutofillCreditCardUploadGooglePayBrandingDescription[] =
-    "If enabled, shows the Google Pay logo and a shorter header message when "
-    "credit card upload to Google Payments is offered.";
+    "If enabled, shows the Google Pay logo, a shorter header message, and a "
+    "narrower dialog when credit card upload to Google Payments is offered.";
 
 const char kEnableAutofillCreditCardUploadSendDetectedValuesName[] =
     "Always send metadata on detected form values for Autofill credit card "

chrome/browser/ui/views/autofill/save_card_bubble_views.cc

@@ -213,6 +213,13 @@ bool SaveCardBubbleViews::IsDialogButtonEnabled(ui::DialogButton button) const {
 }
 
 gfx::Size SaveCardBubbleViews::CalculatePreferredSize() const {
+  if (base::FeatureList::IsEnabled(
+          features::kAutofillUpstreamUseGooglePayBranding)) {
+    const int width = ChromeLayoutProvider::Get()->GetDistanceMetric(
+                          DISTANCE_BUBBLE_PREFERRED_WIDTH) -
+                      margins().width();
+    return gfx::Size(width, GetHeightForWidth(width));
+  }
   return gfx::Size(kBubbleWidth, GetHeightForWidth(kBubbleWidth));
 }