From 99677208ff3b216fdfec551fbe548da5520cd6fb Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Thu, 29 Oct 2020 10:46:47 +0100 Subject: BASELINE: Update Chromium to 86.0.4240.124 Change-Id: Ide0ff151e94cd665ae6521a446995d34a9d1d644 Reviewed-by: Allan Sandfeld Jensen --- chromium/dbus/BUILD.gn | 4 ++++ chromium/dbus/mock_object_proxy.cc | 5 +++++ chromium/dbus/mock_object_proxy.h | 8 ++++++++ 3 files changed, 17 insertions(+) (limited to 'chromium/dbus') diff --git a/chromium/dbus/BUILD.gn b/chromium/dbus/BUILD.gn index 939f6d2dc04..3a64d8bc976 100644 --- a/chromium/dbus/BUILD.gn +++ b/chromium/dbus/BUILD.gn @@ -69,6 +69,10 @@ static_library("test_support") { } test("dbus_unittests") { + if ((is_linux && !is_chromeos) || chromeos_is_browser_only) { + use_xvfb = true + } + sources = [ "bus_unittest.cc", "dbus_statistics_unittest.cc", diff --git a/chromium/dbus/mock_object_proxy.cc b/chromium/dbus/mock_object_proxy.cc index 4929486396b..94a3e67541a 100644 --- a/chromium/dbus/mock_object_proxy.cc +++ b/chromium/dbus/mock_object_proxy.cc @@ -36,6 +36,11 @@ void MockObjectProxy::CallMethodWithErrorCallback( &error_callback); } +void MockObjectProxy::WaitForServiceToBeAvailable( + WaitForServiceToBeAvailableCallback callback) { + DoWaitForServiceToBeAvailable(&callback); +} + void MockObjectProxy::ConnectToSignal( const std::string& interface_name, const std::string& signal_name, diff --git a/chromium/dbus/mock_object_proxy.h b/chromium/dbus/mock_object_proxy.h index 009d9b77212..6052f651961 100644 --- a/chromium/dbus/mock_object_proxy.h +++ b/chromium/dbus/mock_object_proxy.h @@ -65,6 +65,14 @@ class MockObjectProxy : public ObjectProxy { ResponseCallback* callback, ErrorCallback* error_callback)); + // This method is not mockable because it takes a move-only argument. To work + // around this, WaitForServiceToBeAvailable() implementation here calls + // DoWaitForServiceToBeAvailable() which is mockable. + void WaitForServiceToBeAvailable( + WaitForServiceToBeAvailableCallback callback) override; + MOCK_METHOD1(DoWaitForServiceToBeAvailable, + void(WaitForServiceToBeAvailableCallback* callback)); + // This method is not mockable because it takes a move-only argument. To work // around this, ConnectToSignal() implementation here calls // DoConnectToSignal() which is mockable. -- cgit v1.2.1