GitLab

This CL switches the order of checking origin isolation so that opt-in
isolation (which is the stronger of the two), is checked before command-
line isolation.

Bug: 1067389, 1085275
Change-Id: I82eaa73eb4be67f35e8829334cf3e7f3868f87d6
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2346906
Commit-Queue: James MacLean <wjmaclean@chromium.org>
Reviewed-by: Alex Moshchuk <alexmos@chromium.org>
Reviewed-by: Charlie Reis <creis@chromium.org>
Cr-Commit-Position: refs/heads/master@{#797232}