Reland "[Payment Request][Desktop] Add dark mode Chrome logo."

This reverts commit 64d75f14 and relands
commit 3f4fcf06.

Reason for original revert: Broke internal build.
Reason for reland: Deps have rolled, so the internal build should work
now.

TBR=oshima@chromium.org

Bug: 1068516
Change-Id: Ifa114f2a92aa7ba0bfc6f35981b3cb29895f403b
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2209494
Commit-Queue: Rouslan Solomakhin <rouslan@chromium.org>
Reviewed-by: Sahel Sharify <sahel@chromium.org>
Auto-Submit: Rouslan Solomakhin <rouslan@chromium.org>
Cr-Commit-Position: refs/heads/master@{#771962}

chrome/app/theme/theme_resources.grd

@@ -169,6 +169,7 @@
         <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_16" file="chromium/product_logo_16.png" />
         <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_32" file="chromium/product_logo_32.png" />
         <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_NAME_22" file="chromium/product_logo_name_22.png" />
+        <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_NAME_22_WHITE" file="chromium/product_logo_name_22_white.png" />
       </if>
       <if expr="_google_chrome">
         <if expr="not is_android">
@@ -180,6 +181,7 @@
         <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_32_DEV" file="google_chrome/product_logo_32_dev.png" />
         <if expr="not is_android">
           <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_NAME_22" file="google_chrome/product_logo_name_22.png" />
+          <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_NAME_22_WHITE" file="google_chrome/product_logo_name_22_white.png" />
         </if>
         <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_ENTERPRISE" file="google_chrome/product_logo_enterprise.png" />
         <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_ENTERPRISE_WHITE" file="google_chrome/product_logo_enterprise_white.png" />

chrome/browser/ui/views/payments/payment_request_views_util.cc

@@ -277,9 +277,12 @@ std::unique_ptr<views::View> CreateProductLogoFooterView() {
   std::unique_ptr<views::ImageView> chrome_logo =
       std::make_unique<views::ImageView>();
   chrome_logo->set_can_process_events_within_subtree(false);
-  chrome_logo->SetImage(ui::ResourceBundle::GetSharedInstance()
-                            .GetImageNamed(IDR_PRODUCT_LOGO_NAME_22)
-                            .AsImageSkia());
+  chrome_logo->SetImage(
+      ui::ResourceBundle::GetSharedInstance()
+          .GetImageNamed(content_view->GetNativeTheme()->ShouldUseDarkColors()
+                             ? IDR_PRODUCT_LOGO_NAME_22_WHITE
+                             : IDR_PRODUCT_LOGO_NAME_22)
+          .AsImageSkia());
   chrome_logo->set_tooltip_text(l10n_util::GetStringUTF16(IDS_PRODUCT_NAME));
   content_view->AddChildView(std::move(chrome_logo));