[CodeHealth] Convert chrome/browser/ui/views/ from base::Bind and base::Callback to Once/Repeating

Bug: 1152282
Change-Id: Ib5c3905e9a06926701be42fcf7913392a380657f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2592011Reviewed-by: Caroline Rising <corising@chromium.org>
Commit-Queue: Yi Gu <yigu@chromium.org>
Cr-Commit-Position: refs/heads/master@{#837821}

chrome/browser/ui/views/drag_and_drop_interactive_uitest.cc

@@ -267,8 +267,8 @@ class DragStartWaiter : public aura::client::DragDropClient {
     suppress_passing_of_start_drag_further_ = true;
   }
 
-  void PostTaskWhenDragStarts(const base::Closure& callback) {
-    callback_to_run_inside_drag_and_drop_message_loop_ = callback;
+  void PostTaskWhenDragStarts(base::OnceClosure callback) {
+    callback_to_run_inside_drag_and_drop_message_loop_ = std::move(callback);
   }
 
   // aura::client::DragDropClient overrides:
@@ -334,7 +334,7 @@ class DragStartWaiter : public aura::client::DragDropClient {
   content::WebContents* web_contents_;
   scoped_refptr<content::MessageLoopRunner> message_loop_runner_;
   aura::client::DragDropClient* old_client_;
-  base::Closure callback_to_run_inside_drag_and_drop_message_loop_;
+  base::OnceClosure callback_to_run_inside_drag_and_drop_message_loop_;
   bool suppress_passing_of_start_drag_further_;
 
   // Data captured during the first intercepted StartDragAndDrop call.
@@ -1081,10 +1081,10 @@ IN_PROC_BROWSER_TEST_P(DragAndDropBrowserTest, MAYBE_DragImageBetweenFrames) {
   // Start the drag in the left frame.
   DragStartWaiter drag_start_waiter(web_contents());
   drag_start_waiter.PostTaskWhenDragStarts(
-      base::Bind(&DragAndDropBrowserTest::DragImageBetweenFrames_Step2,
-                 base::Unretained(this), base::Unretained(&state)));
-  state.dragstart_event_waiter.reset(
-      new DOMDragEventWaiter("dragstart", left_frame()));
+      base::BindOnce(&DragAndDropBrowserTest::DragImageBetweenFrames_Step2,
+                     base::Unretained(this), base::Unretained(&state)));
+  state.dragstart_event_waiter =
+      std::make_unique<DOMDragEventWaiter>("dragstart", left_frame());
   EXPECT_TRUE(SimulateMouseDownAndDragStartInLeftFrame());
 
   // The next step of the test (DragImageBetweenFrames_Step2) runs inside the
@@ -1291,9 +1291,9 @@ IN_PROC_BROWSER_TEST_P(DragAndDropBrowserTest,
 
   // Start the drag in the left frame.
   DragStartWaiter drag_start_waiter(web_contents());
-  drag_start_waiter.PostTaskWhenDragStarts(
-      base::Bind(&DragAndDropBrowserTest::DragImageFromDisappearingFrame_Step2,
-                 base::Unretained(this), base::Unretained(&state)));
+  drag_start_waiter.PostTaskWhenDragStarts(base::BindOnce(
+      &DragAndDropBrowserTest::DragImageFromDisappearingFrame_Step2,
+      base::Unretained(this), base::Unretained(&state)));
   EXPECT_TRUE(SimulateMouseDownAndDragStartInLeftFrame());
 
   // The next step of the test (DragImageFromDisappearingFrame_Step2) runs
@@ -1404,8 +1404,8 @@ IN_PROC_BROWSER_TEST_P(DragAndDropBrowserTest, MAYBE_CrossSiteDrag) {
   // Start the drag in the left frame.
   DragStartWaiter drag_start_waiter(web_contents());
   drag_start_waiter.PostTaskWhenDragStarts(
-      base::Bind(&DragAndDropBrowserTest::CrossSiteDrag_Step2,
-                 base::Unretained(this), base::Unretained(&state)));
+      base::BindOnce(&DragAndDropBrowserTest::CrossSiteDrag_Step2,
+                     base::Unretained(this), base::Unretained(&state)));
   EXPECT_TRUE(SimulateMouseDownAndDragStartInLeftFrame());
 
   // The next step of the test (CrossSiteDrag_Step2) runs inside the

chrome/browser/ui/views/first_run_dialog.h

@@ -35,7 +35,7 @@ class FirstRunDialog : public views::DialogDelegateView {
 
   views::Checkbox* make_default_ = nullptr;
   views::Checkbox* report_crashes_ = nullptr;
-  base::Closure quit_runloop_;
+  base::RepeatingClosure quit_runloop_;
 
   DISALLOW_COPY_AND_ASSIGN(FirstRunDialog);
 };

chrome/browser/ui/views/importer/import_lock_dialog_view_browsertest.cc

@@ -18,7 +18,7 @@ class ImportLockDialogViewBrowserTest : public DialogBrowserTest {
   // DialogBrowserTest:
   void ShowUi(const std::string& name) override {
     gfx::NativeWindow native_window = browser()->window()->GetNativeWindow();
-    ImportLockDialogView::Show(native_window, base::Callback<void(bool)>());
+    ImportLockDialogView::Show(native_window, base::OnceCallback<void(bool)>());
   }
 
  private:

chrome/browser/ui/views/page_action/pwa_install_view.cc

@@ -101,8 +101,8 @@ void PwaInstallView::UpdateImpl() {
           FeaturePromoTextReplacements::WithString(
               webapps::AppBannerManager::GetInstallableWebAppName(
                   web_contents)),
-          base::Bind(&PwaInstallView::OnIphClosed,
-                     weak_ptr_factory_.GetWeakPtr()));
+          base::BindOnce(&PwaInstallView::OnIphClosed,
+                         weak_ptr_factory_.GetWeakPtr()));
     }
   }
   SetVisible(is_probably_promotable || PWAConfirmationBubbleView::IsShowing());

chrome/browser/ui/views/page_info/page_info_bubble_view_browsertest.cc

@@ -324,9 +324,11 @@ class PageInfoBubbleViewBrowserTest : public DialogBrowserTest {
         ->GetMainFrame()
         ->ExecuteJavaScriptForTests(
             base::ASCIIToUTF16(js),
-            base::BindOnce([](const base::Closure& quit_callback,
-                              base::Value result) { quit_callback.Run(); },
-                           run_loop.QuitClosure()));
+            base::BindOnce(
+                [](base::OnceClosure quit_callback, base::Value result) {
+                  std::move(quit_callback).Run();
+                },
+                run_loop.QuitClosure()));
     run_loop.Run();
   }
 

chrome/browser/ui/views/page_info/permission_selector_row.cc

@@ -176,8 +176,8 @@ PermissionSelectorRow::PermissionSelectorRow(
   // Create the menu model.
   menu_model_ = std::make_unique<PermissionMenuModel>(
       profile, url, permission,
-      base::Bind(&PermissionSelectorRow::PermissionChanged,
-                 base::Unretained(this)));
+      base::BindRepeating(&PermissionSelectorRow::PermissionChanged,
+                          base::Unretained(this)));
 
   // Create the permission combobox.
   InitializeComboboxView(layout, permission);

chrome/browser/ui/views/profiles/profile_picker_view_browsertest.cc

@@ -210,9 +210,9 @@ class ProfilePickerCreationFlowBrowserTest : public ProfilePickerTestBase {
     create_services_subscription_ =
         BrowserContextDependencyManager::GetInstance()
             ->RegisterCreateServicesCallbackForTesting(
-                base::Bind(&ProfilePickerCreationFlowBrowserTest::
-                               OnWillCreateBrowserContextServices,
-                           base::Unretained(this)));
+                base::BindRepeating(&ProfilePickerCreationFlowBrowserTest::
+                                        OnWillCreateBrowserContextServices,
+                                    base::Unretained(this)));
   }
 
   virtual void OnWillCreateBrowserContextServices(

chrome/browser/ui/views/sync/inline_login_ui_browsertest.cc

@@ -428,9 +428,9 @@ class InlineLoginHelperBrowserTest : public InProcessBrowserTest {
     create_services_subscription_ =
         BrowserContextDependencyManager::GetInstance()
             ->RegisterCreateServicesCallbackForTesting(
-                base::Bind(&InlineLoginHelperBrowserTest::
-                               OnWillCreateBrowserContextServices,
-                           base::Unretained(this)));
+                base::BindRepeating(&InlineLoginHelperBrowserTest::
+                                        OnWillCreateBrowserContextServices,
+                                    base::Unretained(this)));
   }
 
   void OnWillCreateBrowserContextServices(content::BrowserContext* context) {
@@ -742,7 +742,7 @@ class InlineLoginUISafeIframeBrowserTest : public InProcessBrowserTest {
  private:
   void SetUp() override {
     embedded_test_server()->RegisterRequestHandler(
-        base::Bind(&EmptyHtmlResponseHandler));
+        base::BindRepeating(&EmptyHtmlResponseHandler));
 
     // Don't spin up the IO thread yet since no threads are allowed while
     // spawning sandbox host process. See crbug.com/322732.

chrome/browser/ui/views/toolbar/toolbar_action_view.h

@@ -50,9 +50,6 @@ class ToolbarActionView : public views::MenuButton,
     ~Delegate() override {}
   };
 
-  // Callback type used for testing.
-  using ContextMenuCallback = base::Callback<void(ToolbarActionView*)>;
-
   ToolbarActionView(ToolbarActionViewController* view_controller,
                     Delegate* delegate);
   ToolbarActionView(const ToolbarActionView&) = delete;