GitLab

In some non-default, extreme, jumbo builds, the kSeparator in
content_index and the kSeparator in push_messaging ended up in
the same translation unit which then prevented compilation.

To avoid that, this patch renames them kSWRIdDescriptionSeparator
and kOriginSWRIdSeparator.

Bug: 973844
Change-Id: I6d29c3b1f1826613e30577870ed02612e30a368c
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1698521
Commit-Queue: Peter Beverloo <peter@chromium.org>
Reviewed-by: Peter Beverloo <peter@chromium.org>
Reviewed-by: Richard Knoll <knollr@chromium.org>
Auto-Submit: Daniel Bratell <bratell@opera.com>
Cr-Commit-Position: refs/heads/master@{#676899}