Merge "Replace usage of base::Callback with std::function"