QUIC: Fix net.gypi to build quic_client_promised_info_test and some merge bugs.

This file now is completely in sync with the internal code once this cl landed.

BUG=

Review-Url: https://codereview.chromium.org/2401643006
Cr-Commit-Position: refs/heads/master@{#424106}
2 files changed