ipc: Refactor Quit.*Deprecated RunLoop Usage
Bug: 922118
Change-Id: I310ff3233732238720dcc29cef169cb0310badc5
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5176027
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Reviewed-by: Ken Rockot <rockot@google.com>
Commit-Queue: Tom Sepez <tsepez@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1244382}
diff --git a/ipc/ipc_send_fds_test.cc b/ipc/ipc_send_fds_test.cc
index 4ce6f980..267daf0c2 100644
--- a/ipc/ipc_send_fds_test.cc
+++ b/ipc/ipc_send_fds_test.cc
@@ -74,10 +74,8 @@
unsigned num_fds_received() const {
return num_fds_received_;
}
-
- void OnChannelError() override {
- base::RunLoop::QuitCurrentWhenIdleDeprecated();
- }
+ void Run() { loop_.Run(); }
+ void OnChannelError() override { loop_.QuitWhenIdle(); }
protected:
void HandleFD(int fd) override {
@@ -98,13 +96,15 @@
ASSERT_EQ(expected_inode_num_, st.st_ino);
++num_fds_received_;
- if (num_fds_received_ == kNumFDsToSend * kNumMessages)
- base::RunLoop::QuitCurrentWhenIdleDeprecated();
+ if (num_fds_received_ == kNumFDsToSend * kNumMessages) {
+ loop_.QuitWhenIdle();
+ }
}
private:
ino_t expected_inode_num_;
unsigned num_fds_received_;
+ base::RunLoop loop_;
};
class IPCSendFdsTest : public IPCChannelMojoTestBase {
@@ -134,7 +134,7 @@
}
// Run message loop.
- base::RunLoop().Run();
+ listener.Run();
// Close the channel so the client's OnChannelError() gets fired.
channel()->Close();
@@ -170,7 +170,7 @@
Connect(&listener);
// Run message loop.
- base::RunLoop().Run();
+ listener.Run();
// Verify that the message loop was exited due to getting the correct number
// of descriptors, and not because of the channel closing unexpectedly.