Commit 81f6ee03 authored by fdoray's avatar fdoray Committed by Commit bot

Remove calls to deprecated MessageLoop methods in net.

This CL (hopefully) removes all calls to these methods in net:
- MessageLoop::PostTask
- MessageLoop::PostDelayedTask
- MessageLoop::DeleteSoon
- MessageLoop::ReleaseSoon
- MessageLoop::Run
- MessageLoop::RunUntilIdle

BUG=616447
R=agl@chromium.org

Review-Url: https://codereview.chromium.org/2315873002
Cr-Commit-Position: refs/heads/master@{#418861}
parent c7a6a6f6
...@@ -8,6 +8,7 @@ ...@@ -8,6 +8,7 @@
#include "base/callback.h" #include "base/callback.h"
#include "base/compiler_specific.h" #include "base/compiler_specific.h"
#include "base/message_loop/message_loop.h" #include "base/message_loop/message_loop.h"
#include "base/run_loop.h"
#include "net/android/network_change_notifier_android.h" #include "net/android/network_change_notifier_android.h"
#include "net/android/network_change_notifier_delegate_android.h" #include "net/android/network_change_notifier_delegate_android.h"
#include "net/base/ip_address.h" #include "net/base/ip_address.h"
...@@ -214,18 +215,18 @@ class BaseNetworkChangeNotifierAndroidTest : public testing::Test { ...@@ -214,18 +215,18 @@ class BaseNetworkChangeNotifierAndroidTest : public testing::Test {
delegate_.SetOnline(); delegate_.SetOnline();
// Note that this is needed because base::ObserverListThreadSafe uses // Note that this is needed because base::ObserverListThreadSafe uses
// PostTask(). // PostTask().
base::MessageLoop::current()->RunUntilIdle(); base::RunLoop().RunUntilIdle();
} }
void SetOffline() { void SetOffline() {
delegate_.SetOffline(); delegate_.SetOffline();
// See comment above. // See comment above.
base::MessageLoop::current()->RunUntilIdle(); base::RunLoop().RunUntilIdle();
} }
void FakeMaxBandwidthChange(double max_bandwidth_mbps) { void FakeMaxBandwidthChange(double max_bandwidth_mbps) {
delegate_.FakeMaxBandwidthChanged(max_bandwidth_mbps); delegate_.FakeMaxBandwidthChanged(max_bandwidth_mbps);
base::MessageLoop::current()->RunUntilIdle(); base::RunLoop().RunUntilIdle();
} }
void FakeNetworkChange(ChangeType change, void FakeNetworkChange(ChangeType change,
...@@ -249,13 +250,13 @@ class BaseNetworkChangeNotifierAndroidTest : public testing::Test { ...@@ -249,13 +250,13 @@ class BaseNetworkChangeNotifierAndroidTest : public testing::Test {
break; break;
} }
// See comment above. // See comment above.
base::MessageLoop::current()->RunUntilIdle(); base::RunLoop().RunUntilIdle();
} }
void FakePurgeActiveNetworkList(NetworkChangeNotifier::NetworkList networks) { void FakePurgeActiveNetworkList(NetworkChangeNotifier::NetworkList networks) {
delegate_.FakePurgeActiveNetworkList(networks); delegate_.FakePurgeActiveNetworkList(networks);
// See comment above. // See comment above.
base::MessageLoop::current()->RunUntilIdle(); base::RunLoop().RunUntilIdle();
} }
NetworkChangeNotifierDelegateAndroid delegate_; NetworkChangeNotifierDelegateAndroid delegate_;
...@@ -422,7 +423,7 @@ TEST_F(NetworkChangeNotifierDelegateAndroidTest, ...@@ -422,7 +423,7 @@ TEST_F(NetworkChangeNotifierDelegateAndroidTest,
TEST_F(NetworkChangeNotifierAndroidTest, InitialSignal) { TEST_F(NetworkChangeNotifierAndroidTest, InitialSignal) {
DNSChangeObserver dns_change_observer; DNSChangeObserver dns_change_observer;
NetworkChangeNotifier::AddDNSObserver(&dns_change_observer); NetworkChangeNotifier::AddDNSObserver(&dns_change_observer);
base::MessageLoop::current()->Run(); base::RunLoop().Run();
EXPECT_EQ(1, dns_change_observer.initial_notifications_count()); EXPECT_EQ(1, dns_change_observer.initial_notifications_count());
EXPECT_EQ(0, dns_change_observer.change_notifications_count()); EXPECT_EQ(0, dns_change_observer.change_notifications_count());
NetworkChangeNotifier::RemoveDNSObserver(&dns_change_observer); NetworkChangeNotifier::RemoveDNSObserver(&dns_change_observer);
......
...@@ -4,9 +4,12 @@ ...@@ -4,9 +4,12 @@
#include <resolv.h> #include <resolv.h>
#include <memory>
#include "base/cancelable_callback.h" #include "base/cancelable_callback.h"
#include "base/files/file_util.h" #include "base/files/file_util.h"
#include "base/message_loop/message_loop.h" #include "base/memory/ptr_util.h"
#include "base/run_loop.h"
#include "base/sys_byteorder.h" #include "base/sys_byteorder.h"
#include "base/test/test_timeouts.h" #include "base/test/test_timeouts.h"
#include "base/threading/platform_thread.h" #include "base/threading/platform_thread.h"
...@@ -208,7 +211,7 @@ class DnsConfigServicePosixTest : public testing::Test { ...@@ -208,7 +211,7 @@ class DnsConfigServicePosixTest : public testing::Test {
void OnConfigChanged(const DnsConfig& config) { void OnConfigChanged(const DnsConfig& config) {
EXPECT_TRUE(config.IsValid()); EXPECT_TRUE(config.IsValid());
seen_config_ = true; seen_config_ = true;
base::MessageLoop::current()->QuitWhenIdle(); run_loop_->QuitWhenIdle();
} }
void WriteMockHostsFile(const char* hosts_string) { void WriteMockHostsFile(const char* hosts_string) {
...@@ -267,7 +270,8 @@ class DnsConfigServicePosixTest : public testing::Test { ...@@ -267,7 +270,8 @@ class DnsConfigServicePosixTest : public testing::Test {
void ExpectChange() { void ExpectChange() {
EXPECT_FALSE(seen_config_); EXPECT_FALSE(seen_config_);
base::MessageLoop::current()->Run(); run_loop_ = base::MakeUnique<base::RunLoop>();
run_loop_->Run();
EXPECT_TRUE(seen_config_); EXPECT_TRUE(seen_config_);
seen_config_ = false; seen_config_ = false;
} }
...@@ -277,6 +281,7 @@ class DnsConfigServicePosixTest : public testing::Test { ...@@ -277,6 +281,7 @@ class DnsConfigServicePosixTest : public testing::Test {
base::FilePath temp_file_; base::FilePath temp_file_;
std::unique_ptr<DnsConfigServicePosix> service_; std::unique_ptr<DnsConfigServicePosix> service_;
DnsConfig test_config_; DnsConfig test_config_;
std::unique_ptr<base::RunLoop> run_loop_;
}; };
TEST_F(DnsConfigServicePosixTest, SeenChangeSinceNetworkChange) { TEST_F(DnsConfigServicePosixTest, SeenChangeSinceNetworkChange) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment