Revert of Remove uses of FontList::Derive*(..) in views payments dialogs.

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

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/views/payments/order_summary_view_controller.h"
 
 #include <memory>
 #include <utility>
 #include <vector>
 
@@ skipping 51 matching lines @@
   // The first column has resize_percent = 1 so that it streches all the way
   // across the row up to the amount label. This way the first label elides as
   // required.
   columns->AddColumn(views::GridLayout::LEADING, views::GridLayout::CENTER, 1,
                      views::GridLayout::USE_PREF, 0, 0);
   columns->AddColumn(views::GridLayout::TRAILING, views::GridLayout::CENTER, 0,
                      views::GridLayout::FIXED, kAmountSectionWidth,
                      kAmountSectionWidth);
 
   layout->StartRow(0, 0);
-  std::unique_ptr<views::Label> label_text;
-  std::unique_ptr<views::Label> amount_text;
-  if (emphasize) {
-    label_text = CreateMediumLabel(label);
-    amount_text = CreateMediumLabel(amount);
-  } else {
-    label_text = base::MakeUnique<views::Label>(label);
-    amount_text = base::MakeUnique<views::Label>(amount);
-  }
+  std::unique_ptr<views::Label> label_text =
+      base::MakeUnique<views::Label>(label);
+  std::unique_ptr<views::Label> amount_text =
+      base::MakeUnique<views::Label>(amount);
   amount_text->set_id(static_cast<int>(amount_label_id));
   amount_text->SetMultiLine(true);
   amount_text->SetAllowCharacterBreak(true);
+  if (emphasize) {
+    label_text->SetFontList(
+        label_text->font_list().DeriveWithWeight(gfx::Font::Weight::MEDIUM));
+    amount_text->SetFontList(
+        amount_text->font_list().DeriveWithWeight(gfx::Font::Weight::MEDIUM));
+  }
   layout->AddView(label_text.release());
   layout->AddView(amount_text.release());
 
   return row;
 }
 
 }  // namespace
 
 OrderSummaryViewController::OrderSummaryViewController(
     PaymentRequestSpec* spec,
@@ skipping 80 matching lines @@
                          total_label_value, true,
                          DialogViewID::ORDER_SUMMARY_TOTAL_AMOUNT_LABEL)
           .release());
 }
 
 void OrderSummaryViewController::UpdatePayButtonState(bool enabled) {
   pay_button_->SetEnabled(enabled);
 }
 
 }  // namespace payments