QUIC - stream id refactor for tests.

QUIC - stream id refactor for tests.

// AKA - http stream pairs bikeshed #1.

This CL is in preparation for HTTP stream pairs changes.  A prototype
of the entire HTTP stream pairs work is in progress.  This CL is one
subset of that.

Rework QUIC tests so that they do not hard code the assumption that
all headers are on stream 3.  Also, prepare to calculate stream ids
according to whether stream pairs are enabled, i.e. whether they
increment by 2 or 4.

Merge internal change: 150949425

R=rch@chromium.org
BUG=

[Buck, 2017-05-02 21:55:05]

The CQ bit was checked by ckrasic@chromium.org to run a CQ dry run

[commit-bot: I haz the power, 2017-05-02 21:55:41]

Dry run: CQ is trying da patch.

Follow status at:
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2017-05-02 21:59:37]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2017-05-02 21:59:38]

Dry run: Try jobs failed on following builders:
  chromeos_amd64-generic_chromium_compile_only_ng on
master.tryserver.chromium.linux (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.linux/builders/chromeos_amd64-...)
  chromeos_daisy_chromium_compile_only_ng on master.tryserver.chromium.linux
(JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.linux/builders/chromeos_daisy_...)
  linux_chromium_chromeos_ozone_rel_ng on master.tryserver.chromium.linux
(JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.linux/builders/linux_chromium_...)
  linux_chromium_tsan_rel_ng on master.tryserver.chromium.linux (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.linux/builders/linux_chromium_...)

[Buck, 2017-05-02 22:17:10]

The CQ bit was checked by ckrasic@chromium.org to run a CQ dry run

[commit-bot: I haz the power, 2017-05-02 22:17:42]

Dry run: CQ is trying da patch.

Follow status at:
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2017-05-02 22:58:41]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2017-05-02 22:58:42]

Dry run: This issue passed the CQ dry run.

[Ryan Hamilton, 2017-05-03 19:15:34]

looks good, but one question?

https://codereview.chromium.org/2854833005/diff/20001/net/quic/chromium/quic_...
File net/quic/chromium/quic_network_transaction_unittest.cc (right):

https://codereview.chromium.org/2854833005/diff/20001/net/quic/chromium/quic_...
net/quic/chromium/quic_network_transaction_unittest.cc:87: const QuicStreamId
kServerDataStreamId1 = 2;
Should these be converted to use the new methods somehow?

https://codereview.chromium.org/2854833005/diff/20001/net/quic/test_tools/qui...
File net/quic/test_tools/quic_test_utils.h (right):

https://codereview.chromium.org/2854833005/diff/20001/net/quic/test_tools/qui...
net/quic/test_tools/quic_test_utils.h:988: QuicStreamId
GetNthServerInitiatedStreamId(QuicVersion version, int n);
Do these methods need to be merged back to the internal repository?

[Buck, 2017-05-03 21:48:16]

https://codereview.chromium.org/2854833005/diff/20001/net/quic/chromium/quic_...
File net/quic/chromium/quic_network_transaction_unittest.cc (right):

https://codereview.chromium.org/2854833005/diff/20001/net/quic/chromium/quic_...
net/quic/chromium/quic_network_transaction_unittest.cc:87: const QuicStreamId
kServerDataStreamId1 = 2;
On 2017/05/03 19:15:34, Ryan Hamilton wrote:
> Should these be converted to use the new methods somehow?

Done.

https://codereview.chromium.org/2854833005/diff/20001/net/quic/test_tools/qui...
File net/quic/test_tools/quic_test_utils.h (right):

https://codereview.chromium.org/2854833005/diff/20001/net/quic/test_tools/qui...
net/quic/test_tools/quic_test_utils.h:988: QuicStreamId
GetNthServerInitiatedStreamId(QuicVersion version, int n);
On 2017/05/03 19:15:34, Ryan Hamilton wrote:
> Do these methods need to be merged back to the internal repository?

Yes.

[Buck, 2017-05-03 21:48:31]

The CQ bit was checked by ckrasic@chromium.org to run a CQ dry run

[commit-bot: I haz the power, 2017-05-03 21:49:17]

Dry run: CQ is trying da patch.

Follow status at:
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[Ryan Hamilton, 2017-05-03 22:01:13]

lgtm

[commit-bot: I haz the power, 2017-05-03 22:31:43]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2017-05-03 22:31:43]

Dry run: This issue passed the CQ dry run.

[Buck, 2017-05-04 20:45:38]

On 2017/05/03 22:01:13, Ryan Hamilton wrote:
> lgtm

Fixed bugs in this I didn't catch before landing the merge.  

I didn't catch them because the tests only crash on debug build, and I forgot
that I turned off debug just before I left for vacation when I was working on
upload performance.

Why it passed trybots is still a mystery to me.

[Ryan Hamilton, 2017-05-04 20:56:36]

lgtm

Nice catch. Weird that it passed on the CQ.