GitLab

Previously, specifying the --isolate-origins command-line flag
prevented any field trials involving the IsolateOrigins feature from
specifying additional isolated origins.  This meant that it's not
possible to experiment with additional isolated origins via field
trials when an IsolateOrigins enterprise policy is in effect.  This CL
changes the logic to instead merge any isolated origins specified in
field trials with those specified by the cmdline flag.

Bug: 894535
Change-Id: If38fe3280dad7f4af3d8b5383556239493ffc7f3
Reviewed-on: https://chromium-review.googlesource.com/c/1279414Reviewed-by: Łukasz Anforowicz <lukasza@chromium.org>
Commit-Queue: Alex Moshchuk <alexmos@chromium.org>
Cr-Commit-Position: refs/heads/master@{#599730}