Commit ede0ba16 authored by Anna Malova's avatar Anna Malova Committed by Commit Bot

Convert AddressTrackerLinux to use RepeatingClosures.

Bug: 1007815
Change-Id: I7dae325790cbd7f9cca45659ee0f7ec9ec27f63f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2083544Reviewed-by: default avatarMatt Menke <mmenke@chromium.org>
Commit-Queue: Anna Malova <amalova@chromium.org>
Cr-Commit-Position: refs/heads/master@{#746375}
parent cb042b64
...@@ -91,11 +91,12 @@ enum NetId { ...@@ -91,11 +91,12 @@ enum NetId {
class NetworkChangeNotifierAndroid::BlockingThreadObjects { class NetworkChangeNotifierAndroid::BlockingThreadObjects {
public: public:
BlockingThreadObjects() BlockingThreadObjects()
: address_tracker_(base::DoNothing(), : address_tracker_(
base::DoNothing(), base::DoNothing(),
// We're only interested in tunnel interface changes. base::DoNothing(),
base::Bind(NotifyNetworkChangeNotifierObservers), // We're only interested in tunnel interface changes.
std::unordered_set<std::string>()) {} base::BindRepeating(NotifyNetworkChangeNotifierObservers),
std::unordered_set<std::string>()) {}
void Init() { void Init() {
address_tracker_.Init(); address_tracker_.Init();
......
...@@ -156,9 +156,9 @@ AddressTrackerLinux::AddressTrackerLinux() ...@@ -156,9 +156,9 @@ AddressTrackerLinux::AddressTrackerLinux()
threads_waiting_for_connection_type_initialization_(0) {} threads_waiting_for_connection_type_initialization_(0) {}
AddressTrackerLinux::AddressTrackerLinux( AddressTrackerLinux::AddressTrackerLinux(
const base::Closure& address_callback, const base::RepeatingClosure& address_callback,
const base::Closure& link_callback, const base::RepeatingClosure& link_callback,
const base::Closure& tunnel_callback, const base::RepeatingClosure& tunnel_callback,
const std::unordered_set<std::string>& ignored_interfaces) const std::unordered_set<std::string>& ignored_interfaces)
: get_interface_name_(GetInterfaceName), : get_interface_name_(GetInterfaceName),
address_callback_(address_callback), address_callback_(address_callback),
......
...@@ -55,9 +55,9 @@ class NET_EXPORT_PRIVATE AddressTrackerLinux { ...@@ -55,9 +55,9 @@ class NET_EXPORT_PRIVATE AddressTrackerLinux {
// interfaces used to connect to the internet can cause critical network // interfaces used to connect to the internet can cause critical network
// changed signals to be lost allowing incorrect stale state to persist. // changed signals to be lost allowing incorrect stale state to persist.
AddressTrackerLinux( AddressTrackerLinux(
const base::Closure& address_callback, const base::RepeatingClosure& address_callback,
const base::Closure& link_callback, const base::RepeatingClosure& link_callback,
const base::Closure& tunnel_callback, const base::RepeatingClosure& tunnel_callback,
const std::unordered_set<std::string>& ignored_interfaces); const std::unordered_set<std::string>& ignored_interfaces);
virtual ~AddressTrackerLinux(); virtual ~AddressTrackerLinux();
...@@ -151,9 +151,9 @@ class NET_EXPORT_PRIVATE AddressTrackerLinux { ...@@ -151,9 +151,9 @@ class NET_EXPORT_PRIVATE AddressTrackerLinux {
// overridden by tests. // overridden by tests.
GetInterfaceNameFunction get_interface_name_; GetInterfaceNameFunction get_interface_name_;
base::Closure address_callback_; base::RepeatingClosure address_callback_;
base::Closure link_callback_; base::RepeatingClosure link_callback_;
base::Closure tunnel_callback_; base::RepeatingClosure tunnel_callback_;
// Note that |watcher_| must be inactive when |netlink_fd_| is closed. // Note that |watcher_| must be inactive when |netlink_fd_| is closed.
base::ScopedFD netlink_fd_; base::ScopedFD netlink_fd_;
......
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