Split Closure part of TestPendingTask out of the struct

device/bluetooth/test/bluetooth_test_win.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 "device/bluetooth/test/bluetooth_test_win.h"
 
 #include "base/bind.h"
 #include "base/location.h"
 #include "base/run_loop.h"
 #include "base/strings/sys_string_conversions.h"
-#include "base/test/test_pending_task.h"
+#include "base/test/test_pending_task_info.h"
 #include "base/time/time.h"
 #include "device/bluetooth/bluetooth_adapter_win.h"
 #include "device/bluetooth/bluetooth_low_energy_win.h"
 #include "device/bluetooth/bluetooth_remote_gatt_characteristic_win.h"
 #include "device/bluetooth/bluetooth_remote_gatt_descriptor_win.h"
 #include "device/bluetooth/bluetooth_remote_gatt_service_win.h"
 
 namespace {
 
 BLUETOOTH_ADDRESS CanonicalStringToBLUETOOTH_ADDRESS(
@@ skipping 38 matching lines @@
     win_uuid.Value.LongUuid.Data4[5] = data[8];
     win_uuid.Value.LongUuid.Data4[6] = data[9];
     win_uuid.Value.LongUuid.Data4[7] = data[10];
   } else {
     CHECK(false);
   }
 
   return win_uuid;
 }
 
+// TODO(tzik): Remove this helper once TaskRunner has migrated from Clrosure to
+// OnceClosure.
+void RunOnceClosure(base::OnceClosure closure) {
+  std::move(closure).Run();
+}
+
 }  // namespace
 
 namespace device {
 BluetoothTestWin::BluetoothTestWin()
     : ui_task_runner_(new base::TestSimpleTaskRunner()),
       bluetooth_task_runner_(new base::TestSimpleTaskRunner()),
       adapter_win_(nullptr),
       fake_bt_classic_wrapper_(nullptr),
       fake_bt_le_wrapper_(nullptr) {}
 BluetoothTestWin::~BluetoothTestWin() {}
@@ skipping 384 matching lines @@
     return nullptr;
   win::GattService* target_service =
       GetSimulatedService(target_device, win_characteristic->GetService());
   if (target_service == nullptr)
     return nullptr;
   return fake_bt_le_wrapper_->GetSimulatedGattCharacteristic(
       target_service, std::to_string(win_characteristic->GetAttributeHandle()));
 }
 
 void BluetoothTestWin::RunPendingTasksUntilCallback() {
-  std::deque<base::TestPendingTask> tasks =
-      bluetooth_task_runner_->TakePendingTasks();
+  base::TestPendingTaskQueue tasks = bluetooth_task_runner_->TakePendingTasks();
   int original_callback_count = callback_count_;
   int original_error_callback_count = error_callback_count_;
   do {
-    base::TestPendingTask task = tasks.front();
+    base::OnceClosure task = std::move(tasks.front().second);
     tasks.pop_front();
-    task.task.Run();
+    std::move(task).Run();
     base::RunLoop().RunUntilIdle();
   } while (tasks.size() && callback_count_ == original_callback_count &&
            error_callback_count_ == original_error_callback_count);
 
   // Put the rest of pending tasks back to Bluetooth task runner.
-  for (const auto& task : tasks) {
-    if (task.delay.is_zero()) {
-      bluetooth_task_runner_->PostTask(task.location, task.task);
+  for (auto& pending_task : tasks) {
+    const base::TestPendingTaskInfo& task_info = pending_task.first;
+    base::Closure task =
+        base::Bind(&RunOnceClosure, base::Passed(&pending_task.second));
+    if (task_info.delay.is_zero()) {
+      bluetooth_task_runner_->PostTask(task_info.location, task);
     } else {
-      bluetooth_task_runner_->PostDelayedTask(task.location, task.task,
-                                              task.delay);
+      bluetooth_task_runner_->PostDelayedTask(task_info.location, task,
+                                              task_info.delay);
     }
   }
 }
 
 void BluetoothTestWin::ForceRefreshDevice() {
   adapter_win_->force_update_device_for_test_ = true;
   FinishPendingTasks();
 }
 
 void BluetoothTestWin::FinishPendingTasks() {
   bluetooth_task_runner_->RunPendingTasks();
   base::RunLoop().RunUntilIdle();
 }
 }