GitLab

Previous changes have left cut points where the change in QR key structure
was split off. This change contains the remainder of those changes. It
doesn't quite make CableDiscoveryData V1-only, but it's a lot closer.

BUG=1002262

Change-Id: Id57aec7f09d574720ed57a49e1482eb6890e3947
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2430324
Commit-Queue: Adam Langley <agl@chromium.org>
Auto-Submit: Adam Langley <agl@chromium.org>
Reviewed-by: Martin Kreichgauer <martinkr@google.com>
Reviewed-by: Adam Langley <agl@chromium.org>
Cr-Commit-Position: refs/heads/master@{#811462}