summaryrefslogtreecommitdiff
path: root/chromium/dbus/test_service.cc
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2018-10-24 11:30:15 +0200
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2018-10-30 12:56:19 +0000
commit6036726eb981b6c4b42047513b9d3f4ac865daac (patch)
tree673593e70678e7789766d1f732eb51f613a2703b /chromium/dbus/test_service.cc
parent466052c4e7c052268fd931888cd58961da94c586 (diff)
downloadqtwebengine-chromium-6036726eb981b6c4b42047513b9d3f4ac865daac.tar.gz
BASELINE: Update Chromium to 70.0.3538.78
Change-Id: Ie634710bf039e26c1957f4ae45e101bd4c434ae7 Reviewed-by: Michael BrĂ¼ning <michael.bruning@qt.io>
Diffstat (limited to 'chromium/dbus/test_service.cc')
-rw-r--r--chromium/dbus/test_service.cc5
1 files changed, 2 insertions, 3 deletions
diff --git a/chromium/dbus/test_service.cc b/chromium/dbus/test_service.cc
index e4a236c6459..06f8b9adb9e 100644
--- a/chromium/dbus/test_service.cc
+++ b/chromium/dbus/test_service.cc
@@ -63,10 +63,9 @@ bool TestService::StartService() {
return StartWithOptions(thread_options);
}
-bool TestService::WaitUntilServiceIsStarted() {
- const base::TimeDelta timeout(TestTimeouts::action_max_timeout());
+void TestService::WaitUntilServiceIsStarted() {
// Wait until the ownership of the service name is obtained.
- return on_name_obtained_.TimedWait(timeout);
+ on_name_obtained_.Wait();
}
void TestService::ShutdownAndBlock() {