Commit a3c0eae9 authored by Daniel Bratell's avatar Daniel Bratell Committed by Commit Bot

Jumbo build fix: Rename some test constants in peerconnection

In jumbo builds many cc files compile in the same translation
unit. That means that they also share the same anonymous namespace
(which is per translation unit, not per file which would have
been better). In https://chromium-review.googlesource.com/c/1316836
and https://chromium-review.googlesource.com/c/1315534 two
peerconnection tests each added a kWriteBufferSize and a
kDelegateReadBufferSize with different values which broke
some jumbo build configurations (unluckily not the one in CQ but
some in fyi builders).

This renames the variables to have more unique names.

TBR=shampson@chromium.org,hbos@chromium.org

Bug: 874296
Change-Id: Ifc8af2be440f7a959b948c05e18deaf55aeefad2
Reviewed-on: https://chromium-review.googlesource.com/c/1322709Reviewed-by: default avatarDaniel Bratell <bratell@opera.com>
Reviewed-by: default avatarHenrik Boström <hbos@chromium.org>
Commit-Queue: Daniel Bratell <bratell@opera.com>
Cr-Commit-Position: refs/heads/master@{#606002}
parent 044528b4
...@@ -18,8 +18,8 @@ using testing::_; ...@@ -18,8 +18,8 @@ using testing::_;
using testing::Invoke; using testing::Invoke;
using testing::InvokeWithoutArgs; using testing::InvokeWithoutArgs;
const uint32_t kWriteBufferSize = 1024; const uint32_t kDefaultStreamWriteBufferSize = 1024;
const uint32_t kDelegateReadBufferSize = 1024; const uint32_t kDefaultStreamDelegateReadBufferSize = 1024;
const quic::QuicStreamId kStreamId = 5; const quic::QuicStreamId kStreamId = 5;
const std::string kSomeData = "howdy"; const std::string kSomeData = "howdy";
...@@ -43,8 +43,8 @@ class P2PQuicStreamTest : public testing::Test { ...@@ -43,8 +43,8 @@ class P2PQuicStreamTest : public testing::Test {
~P2PQuicStreamTest() override {} ~P2PQuicStreamTest() override {}
void InitializeStream( void InitializeStream(
uint32_t delegate_read_buffer_size = kDelegateReadBufferSize, uint32_t delegate_read_buffer_size = kDefaultStreamDelegateReadBufferSize,
uint32_t write_buffer_size = kWriteBufferSize) { uint32_t write_buffer_size = kDefaultStreamWriteBufferSize) {
stream_ = new P2PQuicStreamImpl( stream_ = new P2PQuicStreamImpl(
kStreamId, &session_, delegate_read_buffer_size, write_buffer_size); kStreamId, &session_, delegate_read_buffer_size, write_buffer_size);
stream_->SetDelegate(&delegate_); stream_->SetDelegate(&delegate_);
......
...@@ -27,8 +27,8 @@ using ::testing::MakePolymorphicAction; ...@@ -27,8 +27,8 @@ using ::testing::MakePolymorphicAction;
using ::testing::PolymorphicAction; using ::testing::PolymorphicAction;
const std::string kTriggerRemoteStreamPhrase = "open sesame"; const std::string kTriggerRemoteStreamPhrase = "open sesame";
const uint32_t kWriteBufferSize = 100 * 1024; const uint32_t kTransportWriteBufferSize = 100 * 1024;
const uint32_t kDelegateReadBufferSize = 100 * 1024; const uint32_t kTransportDelegateReadBufferSize = 100 * 1024;
// A custom gmock Action that fires the given callback. This is used in // A custom gmock Action that fires the given callback. This is used in
// conjuction with the CallbackRunLoop in order to drive the TestTaskRunner // conjuction with the CallbackRunLoop in order to drive the TestTaskRunner
...@@ -391,7 +391,8 @@ class P2PQuicTransportTest : public testing::Test { ...@@ -391,7 +391,8 @@ class P2PQuicTransportTest : public testing::Test {
client_certificates.push_back(client_cert); client_certificates.push_back(client_cert);
P2PQuicTransportConfig client_config( P2PQuicTransportConfig client_config(
client_quic_transport_delegate.get(), client_packet_transport.get(), client_quic_transport_delegate.get(), client_packet_transport.get(),
client_certificates, kDelegateReadBufferSize, kWriteBufferSize); client_certificates, kTransportDelegateReadBufferSize,
kTransportWriteBufferSize);
client_config.is_server = false; client_config.is_server = false;
client_config.can_respond_to_crypto_handshake = client_config.can_respond_to_crypto_handshake =
can_respond_to_crypto_handshake; can_respond_to_crypto_handshake;
...@@ -418,7 +419,8 @@ class P2PQuicTransportTest : public testing::Test { ...@@ -418,7 +419,8 @@ class P2PQuicTransportTest : public testing::Test {
server_certificates.push_back(server_cert); server_certificates.push_back(server_cert);
P2PQuicTransportConfig server_config( P2PQuicTransportConfig server_config(
server_quic_transport_delegate.get(), server_packet_transport.get(), server_quic_transport_delegate.get(), server_packet_transport.get(),
server_certificates, kDelegateReadBufferSize, kWriteBufferSize); server_certificates, kTransportDelegateReadBufferSize,
kTransportWriteBufferSize);
server_config.is_server = true; server_config.is_server = true;
server_config.can_respond_to_crypto_handshake = server_config.can_respond_to_crypto_handshake =
can_respond_to_crypto_handshake; can_respond_to_crypto_handshake;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment