Ran clang-format on all .h/.cc files in net/quic. No behavior change.
find ./net/quic/ \( -iname \*.h -o -iname \*.cc \) -exec clang-format -i --style="{BasedOnStyle: Chromium, Standard: Cpp11}" {} \;
BUG=
Review URL: https://codereview.chromium.org/1535113003
Cr-Commit-Position: refs/heads/master@{#366144}
diff --git a/net/quic/test_tools/crypto_test_utils.cc b/net/quic/test_tools/crypto_test_utils.cc
index 5f3b728..de4360e 100644
--- a/net/quic/test_tools/crypto_test_utils.cc
+++ b/net/quic/test_tools/crypto_test_utils.cc
@@ -35,9 +35,7 @@
// CryptoFramerVisitor is a framer visitor that records handshake messages.
class CryptoFramerVisitor : public CryptoFramerVisitorInterface {
public:
- CryptoFramerVisitor()
- : error_(false) {
- }
+ CryptoFramerVisitor() : error_(false) {}
void OnError(CryptoFramer* framer) override { error_ = true; }
@@ -45,13 +43,9 @@
messages_.push_back(message);
}
- bool error() const {
- return error_;
- }
+ bool error() const { return error_; }
- const vector<CryptoHandshakeMessage>& messages() const {
- return messages_;
- }
+ const vector<CryptoHandshakeMessage>& messages() const { return messages_; }
private:
bool error_;
@@ -173,7 +167,6 @@
QuicCryptoClientConfig crypto_config(ProofVerifierForTesting());
AsyncTestChannelIDSource* async_channel_id_source = nullptr;
if (options.channel_id_enabled) {
-
ChannelIDSource* source = ChannelIDSourceForTesting();
if (options.channel_id_source_async) {
async_channel_id_source = new AsyncTestChannelIDSource(source);
@@ -296,10 +289,7 @@
class MockCommonCertSets : public CommonCertSets {
public:
MockCommonCertSets(StringPiece cert, uint64 hash, uint32 index)
- : cert_(cert.as_string()),
- hash_(hash),
- index_(index) {
- }
+ : cert_(cert.as_string()), hash_(hash), index_(index) {}
StringPiece GetCommonHashes() const override {
CHECK(false) << "not implemented";
@@ -443,38 +433,31 @@
StringPiece server_subkey_secret =
server->crypto_negotiated_params().subkey_secret;
-
const char kSampleLabel[] = "label";
const char kSampleContext[] = "context";
const size_t kSampleOutputLength = 32;
string client_key_extraction;
string server_key_extraction;
- EXPECT_TRUE(client->ExportKeyingMaterial(kSampleLabel,
- kSampleContext,
+ EXPECT_TRUE(client->ExportKeyingMaterial(kSampleLabel, kSampleContext,
kSampleOutputLength,
&client_key_extraction));
- EXPECT_TRUE(server->ExportKeyingMaterial(kSampleLabel,
- kSampleContext,
+ EXPECT_TRUE(server->ExportKeyingMaterial(kSampleLabel, kSampleContext,
kSampleOutputLength,
&server_key_extraction));
- CompareCharArraysWithHexError("client write key",
- client_encrypter_key.data(),
+ CompareCharArraysWithHexError("client write key", client_encrypter_key.data(),
client_encrypter_key.length(),
server_decrypter_key.data(),
server_decrypter_key.length());
- CompareCharArraysWithHexError("client write IV",
- client_encrypter_iv.data(),
+ CompareCharArraysWithHexError("client write IV", client_encrypter_iv.data(),
client_encrypter_iv.length(),
server_decrypter_iv.data(),
server_decrypter_iv.length());
- CompareCharArraysWithHexError("server write key",
- server_encrypter_key.data(),
+ CompareCharArraysWithHexError("server write key", server_encrypter_key.data(),
server_encrypter_key.length(),
client_decrypter_key.data(),
client_decrypter_key.length());
- CompareCharArraysWithHexError("server write IV",
- server_encrypter_iv.data(),
+ CompareCharArraysWithHexError("server write IV", server_encrypter_iv.data(),
server_encrypter_iv.length(),
client_decrypter_iv.data(),
client_decrypter_iv.length());
@@ -498,16 +481,14 @@
server_forward_secure_encrypter_iv.length(),
client_forward_secure_decrypter_iv.data(),
client_forward_secure_decrypter_iv.length());
- CompareCharArraysWithHexError("subkey secret",
- client_subkey_secret.data(),
+ CompareCharArraysWithHexError("subkey secret", client_subkey_secret.data(),
client_subkey_secret.length(),
server_subkey_secret.data(),
server_subkey_secret.length());
- CompareCharArraysWithHexError("sample key extraction",
- client_key_extraction.data(),
- client_key_extraction.length(),
- server_key_extraction.data(),
- server_key_extraction.length());
+ CompareCharArraysWithHexError(
+ "sample key extraction", client_key_extraction.data(),
+ client_key_extraction.length(), server_key_extraction.data(),
+ server_key_extraction.length());
}
// static
@@ -518,7 +499,7 @@
QuicTag tag = 0;
if (tagstr[0] == '#') {
- CHECK_EQ(static_cast<size_t>(1 + 2*4), len);
+ CHECK_EQ(static_cast<size_t>(1 + 2 * 4), len);
tagstr++;
for (size_t i = 0; i < 8; i++) {
@@ -579,18 +560,18 @@
len--;
CHECK_EQ(0u, len % 2);
- scoped_ptr<uint8[]> buf(new uint8[len/2]);
+ scoped_ptr<uint8[]> buf(new uint8[len / 2]);
- for (size_t i = 0; i < len/2; i++) {
+ for (size_t i = 0; i < len / 2; i++) {
uint8 v = 0;
- CHECK(HexChar(valuestr[i*2], &v));
+ CHECK(HexChar(valuestr[i * 2], &v));
buf[i] = v << 4;
- CHECK(HexChar(valuestr[i*2 + 1], &v));
+ CHECK(HexChar(valuestr[i * 2 + 1], &v));
buf[i] |= v;
}
msg.SetStringPiece(
- tag, StringPiece(reinterpret_cast<char*>(buf.get()), len/2));
+ tag, StringPiece(reinterpret_cast<char*>(buf.get()), len / 2));
continue;
}
