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

chrome/browser/ui/test/test_browser_dialog.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/test/test_browser_dialog.h"
 
 #include "base/command_line.h"
 #include "base/message_loop/message_loop.h"
 #include "base/stl_util.h"
 #include "base/test/gtest_util.h"
@@ skipping 12 matching lines @@
 #endif
 
 namespace {
 
 // An automatic action for WidgetCloser to post to the RunLoop.
 // TODO(tapted): Explore asynchronous Widget::Close() and DialogClientView::
 // {Accept,Cancel}Window() approaches to test other dialog lifetimes.
 enum class DialogAction {
   INTERACTIVE,  // Run interactively.
   CLOSE_NOW,    // Call Widget::CloseNow().
-  CLOSE,        // Call Widget::Close().
 };
 
 // Helper to break out of the nested run loop that runs a test dialog.
 class WidgetCloser : public views::WidgetObserver {
  public:
   WidgetCloser(views::Widget* widget, DialogAction action)
-      : action_(action), widget_(widget), weak_ptr_factory_(this) {
+      : widget_(widget), weak_ptr_factory_(this) {
     widget->AddObserver(this);
     if (action == DialogAction::INTERACTIVE)
       return;
 
     base::ThreadTaskRunnerHandle::Get()->PostTask(
-        FROM_HERE, base::BindOnce(&WidgetCloser::CloseAction,
+        FROM_HERE, base::BindOnce(&WidgetCloser::CloseNow,
                                   weak_ptr_factory_.GetWeakPtr()));
   }
 
   // WidgetObserver:
   void OnWidgetDestroyed(views::Widget* widget) override {
     widget_->RemoveObserver(this);
     widget_ = nullptr;
     base::MessageLoop::current()->QuitNow();
   }
 
  private:
-  void CloseAction() {
-    if (!widget_)
-      return;
-
-    switch (action_) {
-      case DialogAction::CLOSE_NOW:
-        widget_->CloseNow();
-        break;
-      case DialogAction::CLOSE:
-        widget_->Close();
-        break;
-      case DialogAction::INTERACTIVE:
-        NOTREACHED();
-        break;
-    }
+  void CloseNow() {
+    if (widget_)
+      widget_->CloseNow();
   }
 
-  const DialogAction action_;
   views::Widget* widget_;
 
   base::WeakPtrFactory<WidgetCloser> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(WidgetCloser);
 };
 
 // Extracts the |name| argument for ShowDialog() from the current test case.
 // E.g. for InvokeDialog_name (or DISABLED_InvokeDialog_name) returns "name".
 std::string NameFromTestCase() {
@@ skipping 45 matching lines @@
     // ignore added Widgets that are not dialogs.
     base::EraseIf(added, [](views::Widget* widget) {
       return !widget->widget_delegate()->AsDialogDelegate();
     });
   }
 
   // This can fail if no dialog was shown, if the dialog shown wasn't a toolkit-
   // views dialog, or if more than one child dialog was shown.
   ASSERT_EQ(1u, added.size());
 
-  DialogAction action = DialogAction::CLOSE_NOW;
-  if (base::CommandLine::ForCurrentProcess()->HasSwitch(
-          internal::kInteractiveSwitch)) {
-    action = DialogAction::INTERACTIVE;
-  } else if (AlwaysCloseAsynchronously()) {
-    // TODO(tapted): Iterate over close methods when non-interactive for greater
-    // test coverage.
-    action = DialogAction::CLOSE;
-  }
+  const DialogAction action = base::CommandLine::ForCurrentProcess()->HasSwitch(
+                                  internal::kInteractiveSwitch)
+                                  ? DialogAction::INTERACTIVE
+                                  : DialogAction::CLOSE_NOW;
 
   WidgetCloser closer(added[0], action);
   ::test::RunTestInteractively();
 }
-
-bool TestBrowserDialog::AlwaysCloseAsynchronously() {
-  return false;
-}