Remove usages of base::MessageLoop and base/message_loop/message_loop.h
It's the same as SingleThreadTaskExecutor now, and it will be removed.
BUG=chromium:1094927
TEST=CQ
TEST=ml_service_impl_fuzzer, ml_service_load_flatbuffer_fuzzer
Exempt-From-Owner-Approval: Mechanical change involving a lot of owners.
Change-Id: Idfd09df30d59fe1a79eddc8336a14a12ec215b42
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform2/+/2474979
Reviewed-by: Maksim Ivanov <emaxx@chromium.org>
Reviewed-by: Eric Caruso <ejcaruso@chromium.org>
Reviewed-by: Tom Hughes <tomhughes@chromium.org>
Reviewed-by: Ryo Hashimoto <hashimoto@chromium.org>
Reviewed-by: John Riordan <jrio@chromium.org>
Reviewed-by: John Riordan <jrio@google.com>
Reviewed-by: Xinglong Luan <alanlxl@chromium.org>
Tested-by: Qijiang Fan <fqj@google.com>
Commit-Queue: Qijiang Fan <fqj@google.com>
diff --git a/biod/biod_storage.cc b/biod/biod_storage.cc
index acb361d..4eeb25a 100644
--- a/biod/biod_storage.cc
+++ b/biod/biod_storage.cc
@@ -21,7 +21,6 @@
#include <base/json/json_reader.h>
#include <base/json/json_string_value_serializer.h>
#include <base/logging.h>
-#include <base/message_loop/message_loop.h>
#include <base/strings/string_util.h>
#include <base/values.h>
diff --git a/buffet/manager.cc b/buffet/manager.cc
index 3af3370..60e1b14 100644
--- a/buffet/manager.cc
+++ b/buffet/manager.cc
@@ -15,7 +15,6 @@
#include <base/files/file_util.h>
#include <base/json/json_reader.h>
#include <base/json/json_writer.h>
-#include <base/message_loop/message_loop.h>
#include <base/time/time.h>
#include <brillo/dbus/async_event_sequencer.h>
#include <brillo/dbus/exported_object_manager.h>
diff --git a/diagnostics/cros_healthd/network_diagnostics/network_diagnostics_adapter_impl_test.cc b/diagnostics/cros_healthd/network_diagnostics/network_diagnostics_adapter_impl_test.cc
index d5c4418..b86e2d9 100644
--- a/diagnostics/cros_healthd/network_diagnostics/network_diagnostics_adapter_impl_test.cc
+++ b/diagnostics/cros_healthd/network_diagnostics/network_diagnostics_adapter_impl_test.cc
@@ -5,9 +5,9 @@
#include <utility>
#include <vector>
-#include <base/message_loop/message_loop.h>
#include <base/run_loop.h>
#include <base/test/bind_test_util.h>
+#include <base/test/task_environment.h>
#include <gmock/gmock.h>
#include <gtest/gtest.h>
#include <mojo/public/cpp/bindings/pending_remote.h>
@@ -117,7 +117,7 @@
}
private:
- base::MessageLoop message_loop_;
+ base::test::SingleThreadTaskEnvironment task_environment_;
NetworkDiagnosticsAdapterImpl network_diagnostics_adapter_;
};
diff --git a/diagnostics/cros_healthd/routines/gateway_can_be_pinged/gateway_can_be_pinged_test.cc b/diagnostics/cros_healthd/routines/gateway_can_be_pinged/gateway_can_be_pinged_test.cc
index e39fa97..d187cdc 100644
--- a/diagnostics/cros_healthd/routines/gateway_can_be_pinged/gateway_can_be_pinged_test.cc
+++ b/diagnostics/cros_healthd/routines/gateway_can_be_pinged/gateway_can_be_pinged_test.cc
@@ -8,7 +8,7 @@
#include <base/run_loop.h>
#include <base/optional.h>
-#include <base/message_loop/message_loop.h>
+#include <base/test/task_environment.h>
#include <gmock/gmock.h>
#include <gtest/gtest.h>
@@ -68,7 +68,7 @@
}
private:
- base::MessageLoop message_loop_;
+ base::test::SingleThreadTaskEnvironment task_environment_;
MockContext mock_context_;
std::unique_ptr<DiagnosticRoutine> routine_;
};
diff --git a/diagnostics/cros_healthd/routines/has_secure_wifi_connection/has_secure_wifi_connection_test.cc b/diagnostics/cros_healthd/routines/has_secure_wifi_connection/has_secure_wifi_connection_test.cc
index 98adede..6d965c7 100644
--- a/diagnostics/cros_healthd/routines/has_secure_wifi_connection/has_secure_wifi_connection_test.cc
+++ b/diagnostics/cros_healthd/routines/has_secure_wifi_connection/has_secure_wifi_connection_test.cc
@@ -8,7 +8,7 @@
#include <base/run_loop.h>
#include <base/optional.h>
-#include <base/message_loop/message_loop.h>
+#include <base/test/task_environment.h>
#include <gmock/gmock.h>
#include <gtest/gtest.h>
@@ -70,7 +70,7 @@
}
private:
- base::MessageLoop message_loop_;
+ base::test::SingleThreadTaskEnvironment task_environment_;
MockContext mock_context_;
std::unique_ptr<DiagnosticRoutine> routine_;
};
diff --git a/diagnostics/cros_healthd/routines/lan_connectivity/lan_connectivity_test.cc b/diagnostics/cros_healthd/routines/lan_connectivity/lan_connectivity_test.cc
index af92873..fbd4ff3 100644
--- a/diagnostics/cros_healthd/routines/lan_connectivity/lan_connectivity_test.cc
+++ b/diagnostics/cros_healthd/routines/lan_connectivity/lan_connectivity_test.cc
@@ -7,7 +7,7 @@
#include <base/run_loop.h>
#include <base/optional.h>
-#include <base/message_loop/message_loop.h>
+#include <base/test/task_environment.h>
#include <gmock/gmock.h>
#include <gtest/gtest.h>
@@ -59,7 +59,7 @@
}
private:
- base::MessageLoop message_loop_;
+ base::test::SingleThreadTaskEnvironment task_environment_;
MockContext mock_context_;
std::unique_ptr<DiagnosticRoutine> routine_;
};
diff --git a/diagnostics/cros_healthd/routines/signal_strength/signal_strength_test.cc b/diagnostics/cros_healthd/routines/signal_strength/signal_strength_test.cc
index 7b2062f..7808bc0 100644
--- a/diagnostics/cros_healthd/routines/signal_strength/signal_strength_test.cc
+++ b/diagnostics/cros_healthd/routines/signal_strength/signal_strength_test.cc
@@ -8,7 +8,7 @@
#include <base/run_loop.h>
#include <base/optional.h>
-#include <base/message_loop/message_loop.h>
+#include <base/test/task_environment.h>
#include <gmock/gmock.h>
#include <gtest/gtest.h>
@@ -68,7 +68,7 @@
}
private:
- base::MessageLoop message_loop_;
+ base::test::SingleThreadTaskEnvironment task_environment_;
MockContext mock_context_;
std::unique_ptr<DiagnosticRoutine> routine_;
};
diff --git a/media_perception/mojo_connector.cc b/media_perception/mojo_connector.cc
index 3e5a5ac..54b6a10 100644
--- a/media_perception/mojo_connector.cc
+++ b/media_perception/mojo_connector.cc
@@ -71,7 +71,7 @@
mojo::core::Init();
LOG(INFO) << "Starting IPC thread.";
if (!ipc_thread_.StartWithOptions(
- base::Thread::Options(base::MessageLoop::TYPE_IO, 0))) {
+ base::Thread::Options(base::MessagePumpType::IO, 0))) {
LOG(ERROR) << "Failed to start IPC Thread";
}
ipc_support_ = std::make_unique<mojo::core::ScopedIPCSupport>(
diff --git a/ml/fuzzers/ml_service_impl_fuzzer.cc b/ml/fuzzers/ml_service_impl_fuzzer.cc
index e3570c8..f6330d2 100644
--- a/ml/fuzzers/ml_service_impl_fuzzer.cc
+++ b/ml/fuzzers/ml_service_impl_fuzzer.cc
@@ -13,7 +13,7 @@
#include <base/files/file_util.h>
#include <base/macros.h>
#include <base/run_loop.h>
-#include <base/message_loop/message_loop.h>
+#include <base/task/single_thread_task_executor.h>
#include <brillo/message_loops/base_message_loop.h>
#include <fuzzer/FuzzedDataProvider.h>
#include <mojo/public/cpp/bindings/binding.h>
@@ -167,8 +167,8 @@
base::AtExitManager at_exit_manager;
// Mock main task runner
- base::MessageLoopForIO message_loop;
- brillo::BaseMessageLoop brillo_loop(&message_loop);
+ base::SingleThreadTaskExecutor task_executor(base::MessagePumpType::IO);
+ brillo::BaseMessageLoop brillo_loop(task_executor.task_runner());
brillo_loop.SetAsCurrent();
ml::MLServiceFuzzer fuzzer;
diff --git a/ml/fuzzers/ml_service_load_flatbuffer_fuzzer.cc b/ml/fuzzers/ml_service_load_flatbuffer_fuzzer.cc
index 7a7e36b..e2d65ab 100644
--- a/ml/fuzzers/ml_service_load_flatbuffer_fuzzer.cc
+++ b/ml/fuzzers/ml_service_load_flatbuffer_fuzzer.cc
@@ -11,7 +11,6 @@
#include <base/bind.h>
#include <base/macros.h>
#include <base/run_loop.h>
-#include <base/message_loop/message_loop.h>
#include <brillo/message_loops/base_message_loop.h>
#include <fuzzer/FuzzedDataProvider.h>
#include <mojo/public/cpp/bindings/binding.h>
@@ -90,8 +89,8 @@
base::AtExitManager at_exit_manager;
// Mock main task runner
- base::MessageLoopForIO message_loop;
- brillo::BaseMessageLoop brillo_loop(&message_loop);
+ base::SingleThreadTaskExecutor task_executor(base::MessagePumpType::IO);
+ brillo::BaseMessageLoop brillo_loop(task_executor.task_runner());
brillo_loop.SetAsCurrent();
ml::MLServiceFuzzer fuzzer;
diff --git a/patchpanel/multicast_forwarder.cc b/patchpanel/multicast_forwarder.cc
index 78a578e..634ba20 100644
--- a/patchpanel/multicast_forwarder.cc
+++ b/patchpanel/multicast_forwarder.cc
@@ -16,7 +16,6 @@
#include <base/bind.h>
#include <base/logging.h>
-#include <base/message_loop/message_loop.h>
#include "patchpanel/dns/dns_protocol.h"
#include "patchpanel/dns/dns_response.h"
diff --git a/permission_broker/permission_broker.h b/permission_broker/permission_broker.h
index 8bd8cf2..7db6fbb 100644
--- a/permission_broker/permission_broker.h
+++ b/permission_broker/permission_broker.h
@@ -12,7 +12,6 @@
#include <vector>
#include <base/macros.h>
-#include <base/message_loop/message_loop.h>
#include <base/sequenced_task_runner.h>
#include <base/time/time.h>
#include <dbus/bus.h>
diff --git a/permission_broker/port_tracker.h b/permission_broker/port_tracker.h
index b12b727..91c55dd 100644
--- a/permission_broker/port_tracker.h
+++ b/permission_broker/port_tracker.h
@@ -14,7 +14,6 @@
#include <base/files/file_descriptor_watcher_posix.h>
#include <base/macros.h>
-#include <base/message_loop/message_loop.h>
#include <base/sequenced_task_runner.h>
#include <patchpanel/proto_bindings/patchpanel_service.pb.h>
diff --git a/permission_broker/usb_driver_tracker.h b/permission_broker/usb_driver_tracker.h
index 79d9ed1..3aca9e5 100644
--- a/permission_broker/usb_driver_tracker.h
+++ b/permission_broker/usb_driver_tracker.h
@@ -11,7 +11,7 @@
#include <vector>
#include <base/macros.h>
-#include <base/message_loop/message_loop.h>
+#include <base/memory/weak_ptr.h>
namespace permission_broker {
diff --git a/power_manager/common/test_main_loop_runner.cc b/power_manager/common/test_main_loop_runner.cc
index 1ad2966..236c771 100644
--- a/power_manager/common/test_main_loop_runner.cc
+++ b/power_manager/common/test_main_loop_runner.cc
@@ -6,7 +6,6 @@
#include <base/location.h>
#include <base/logging.h>
-#include <base/message_loop/message_loop.h>
#include <base/run_loop.h>
#include "power_manager/common/util.h"
diff --git a/power_manager/powerd/policy/suspend_delay_controller.cc b/power_manager/powerd/policy/suspend_delay_controller.cc
index 0f8933b..7437233 100644
--- a/power_manager/powerd/policy/suspend_delay_controller.cc
+++ b/power_manager/powerd/policy/suspend_delay_controller.cc
@@ -10,7 +10,6 @@
#include <base/bind.h>
#include <base/logging.h>
-#include <base/message_loop/message_loop.h>
#include <base/strings/string_number_conversions.h>
#include <chromeos/dbus/service_constants.h>
diff --git a/timberslide/timberslide.cc b/timberslide/timberslide.cc
index 09f83c1..6acb59d 100644
--- a/timberslide/timberslide.cc
+++ b/timberslide/timberslide.cc
@@ -14,7 +14,6 @@
#include <base/files/file_util.h>
#include <base/files/file_path.h>
#include <base/logging.h>
-#include <base/message_loop/message_loop.h>
#include <base/strings/stringprintf.h>
#include <base/strings/string_number_conversions.h>
#include <base/time/time.h>
diff --git a/virtual_file_provider/virtual_file_provider.cc b/virtual_file_provider/virtual_file_provider.cc
index 83e2e72..3033d61 100644
--- a/virtual_file_provider/virtual_file_provider.cc
+++ b/virtual_file_provider/virtual_file_provider.cc
@@ -146,11 +146,7 @@
virtual_file_provider::ServiceThread service_thread(fuse_mount_path,
&size_map);
base::Thread::Options options;
-#if BASE_VER < 780000
- options.message_loop_type = base::MessageLoop::TYPE_IO;
-#else
options.message_pump_type = base::MessagePumpType::IO;
-#endif
service_thread.StartWithOptions(options);
// Enter the FUSE main loop.
