summaryrefslogtreecommitdiff
path: root/chromium/content/browser/service_process_host_impl.cc
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2020-01-20 13:40:20 +0100
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2020-01-22 12:41:23 +0000
commit7961cea6d1041e3e454dae6a1da660b453efd238 (patch)
treec0eeb4a9ff9ba32986289c1653d9608e53ccb444 /chromium/content/browser/service_process_host_impl.cc
parentb7034d0803538058e5c9d904ef03cf5eab34f6ef (diff)
downloadqtwebengine-chromium-7961cea6d1041e3e454dae6a1da660b453efd238.tar.gz
BASELINE: Update Chromium to 78.0.3904.130
Change-Id: If185e0c0061b3437531c97c9c8c78f239352a68b Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/content/browser/service_process_host_impl.cc')
-rw-r--r--chromium/content/browser/service_process_host_impl.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/chromium/content/browser/service_process_host_impl.cc b/chromium/content/browser/service_process_host_impl.cc
index f41cf58a87c..f0873d3dc5f 100644
--- a/chromium/content/browser/service_process_host_impl.cc
+++ b/chromium/content/browser/service_process_host_impl.cc
@@ -30,8 +30,7 @@ class ServiceProcessTracker {
public:
ServiceProcessTracker()
: ui_task_runner_(
- base::CreateSingleThreadTaskRunnerWithTraits({BrowserThread::UI})) {
- }
+ base::CreateSingleThreadTaskRunner({BrowserThread::UI})) {}
~ServiceProcessTracker() = default;
ServiceProcessInfo AddProcess(const base::Process& process,
@@ -173,6 +172,7 @@ void LaunchServiceProcessOnIOThread(mojo::GenericPendingReceiver receiver,
: base::UTF8ToUTF16(*receiver.interface_name()));
host->SetMetricsName(*receiver.interface_name());
host->SetSandboxType(options.sandbox_type);
+ host->SetExtraCommandLineSwitches(std::move(options.extra_switches));
if (options.child_flags)
host->set_child_flags(*options.child_flags);
host->Start();
@@ -200,7 +200,7 @@ void ServiceProcessHost::RemoveObserver(Observer* observer) {
void ServiceProcessHost::Launch(mojo::GenericPendingReceiver receiver,
Options options) {
DCHECK(receiver.interface_name().has_value());
- base::CreateSingleThreadTaskRunnerWithTraits({BrowserThread::IO})
+ base::CreateSingleThreadTaskRunner({BrowserThread::IO})
->PostTask(FROM_HERE,
base::BindOnce(&LaunchServiceProcessOnIOThread,
std::move(receiver), std::move(options)));