[Code health] Convert base::Bind in media_galleries_permission_controller_unittest.cc

This CL converts the base::Bind to base::BindOnce in that file. It
is a code health CL, no behaviour change is expected.

Bug: 1152278
Change-Id: I5524c86ea0e9a58c2beb87c224d0d220630dead1
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2593747Reviewed-by: Tommy Li <tommycli@chromium.org>
Commit-Queue: Xida Chen <xidachen@chromium.org>
Cr-Commit-Position: refs/heads/master@{#837145}

chrome/browser/media_galleries/media_galleries_dialog_controller_test_util.cc

@@ -5,13 +5,11 @@
 #include "chrome/browser/media_galleries/media_galleries_dialog_controller_test_util.h"
 
 MockMediaGalleriesDialog::MockMediaGalleriesDialog(
-    const DialogDestroyedCallback& callback)
-    : update_count_(0),
-  dialog_destroyed_callback_(callback) {
-}
+    DialogDestroyedCallback callback)
+    : update_count_(0), dialog_destroyed_callback_(std::move(callback)) {}
 
 MockMediaGalleriesDialog::~MockMediaGalleriesDialog() {
-  dialog_destroyed_callback_.Run(update_count_);
+  std::move(dialog_destroyed_callback_).Run(update_count_);
 }
 
 void MockMediaGalleriesDialog::UpdateGalleries() {

chrome/browser/media_galleries/media_galleries_dialog_controller_test_util.h

@@ -11,9 +11,9 @@
 
 class MockMediaGalleriesDialog : public MediaGalleriesDialog {
  public:
-  typedef base::Callback<void(int update_count)> DialogDestroyedCallback;
+  typedef base::OnceCallback<void(int update_count)> DialogDestroyedCallback;
 
-  explicit MockMediaGalleriesDialog(const DialogDestroyedCallback& callback);
+  explicit MockMediaGalleriesDialog(DialogDestroyedCallback callback);
   ~MockMediaGalleriesDialog() override;
 
   // MediaGalleriesDialog implementation.

chrome/browser/media_galleries/media_galleries_permission_controller.cc

@@ -67,7 +67,7 @@ MediaGalleriesPermissionController::MediaGalleriesPermissionController(
       preferences_(
           g_browser_process->media_file_system_registry()->GetPreferences(
               GetProfile())),
-      create_dialog_callback_(base::Bind(&MediaGalleriesDialog::Create)) {
+      create_dialog_callback_(base::BindOnce(&MediaGalleriesDialog::Create)) {
   // Passing unretained pointer is safe, since the dialog controller
   // is self-deleting, and so won't be deleted until it can be shown
   // and then closed.
@@ -92,19 +92,19 @@ void MediaGalleriesPermissionController::OnPreferencesInitialized() {
     InitializePermissions();
   }
 
-  dialog_.reset(create_dialog_callback_.Run(this));
+  dialog_.reset(std::move(create_dialog_callback_).Run(this));
 }
 
 MediaGalleriesPermissionController::MediaGalleriesPermissionController(
     const extensions::Extension& extension,
     MediaGalleriesPreferences* preferences,
-    const CreateDialogCallback& create_dialog_callback,
+    CreateDialogCallback create_dialog_callback,
     base::OnceClosure on_finish)
     : web_contents_(nullptr),
       extension_(&extension),
       on_finish_(std::move(on_finish)),
       preferences_(preferences),
-      create_dialog_callback_(create_dialog_callback) {
+      create_dialog_callback_(std::move(create_dialog_callback)) {
   OnPreferencesInitialized();
 }
 

chrome/browser/media_galleries/media_galleries_permission_controller.h

@@ -76,14 +76,15 @@ class MediaGalleriesPermissionController
  protected:
   friend class MediaGalleriesPermissionControllerTest;
 
-  typedef base::Callback<MediaGalleriesDialog* (
-      MediaGalleriesDialogController*)> CreateDialogCallback;
+  typedef base::OnceCallback<MediaGalleriesDialog*(
+      MediaGalleriesDialogController*)>
+      CreateDialogCallback;
 
   // For use with tests.
   MediaGalleriesPermissionController(
       const extensions::Extension& extension,
       MediaGalleriesPreferences* preferences,
-      const CreateDialogCallback& create_dialog_callback,
+      CreateDialogCallback create_dialog_callback,
       base::OnceClosure on_finish);
 
   ~MediaGalleriesPermissionController() override;

chrome/browser/media_galleries/media_galleries_permission_controller_unittest.cc

@@ -80,11 +80,11 @@ class MediaGalleriesPermissionControllerTest : public ::testing::Test {
   void StartDialog() {
     ASSERT_FALSE(controller_);
     controller_ = new MediaGalleriesPermissionController(
-        *extension_.get(),
-        gallery_prefs_.get(),
-        base::Bind(&MediaGalleriesPermissionControllerTest::CreateMockDialog,
-                   base::Unretained(this)),
-        base::Bind(
+        *extension_.get(), gallery_prefs_.get(),
+        base::BindOnce(
+            &MediaGalleriesPermissionControllerTest::CreateMockDialog,
+            base::Unretained(this)),
+        base::BindOnce(
             &MediaGalleriesPermissionControllerTest::OnControllerDone,
             base::Unretained(this)));
   }
@@ -123,7 +123,7 @@ class MediaGalleriesPermissionControllerTest : public ::testing::Test {
       MediaGalleriesDialogController* controller) {
     EXPECT_FALSE(dialog_);
     dialog_update_count_at_destruction_ = 0;
-    dialog_ = new MockMediaGalleriesDialog(base::Bind(
+    dialog_ = new MockMediaGalleriesDialog(base::BindOnce(
         &MediaGalleriesPermissionControllerTest::OnDialogDestroyed,
         weak_factory_.GetWeakPtr()));
     return dialog_;