Misc cleanup in net/spdy/core.

net/spdy/core/spdy_test_utils.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/spdy/core/spdy_test_utils.h"
 
 #include <algorithm>
 #include <cstring>
 #include <memory>
 #include <new>
@@ skipping 20 matching lines @@
   static const int kColumns = 4;
 
   const int kSizeLimit = 1024;
   if (length > kSizeLimit || mark_length > kSizeLimit) {
     LOG(ERROR) << "Only dumping first " << kSizeLimit << " bytes.";
     length = std::min(length, kSizeLimit);
     mark_length = std::min(mark_length, kSizeLimit);
   }
 
   SpdyString hex;
-  for (const unsigned char* row = data; length > 0;
+  for (const unsigned char *row = data; length > 0;
        row += kColumns, length -= kColumns) {
-    for (const unsigned char *p = row; p < row + 4; ++p) {
+    for (const unsigned char* p = row; p < row + 4; ++p) {

[Biren Roy, 2017/05/24 15:25:09]

These two diffs, in conjunction, make me sad. :(

[Bence, 2017/05/24 15:38:48]

You are not the only one.  I tried to change it, but strangely enough, the
internal git clang-format really insist on this.  On the other hand, Chromium's
git cl format accepts either form for both lines.

       if (p < row + length) {
         const bool mark =
             (marks && (p - data) < mark_length && marks[p - data]);
         hex += mark ? '*' : ' ';
         hex += kHexChars[(*p & 0xf0) >> 4];
         hex += kHexChars[*p & 0x0f];
         hex += mark ? '*' : ' ';
       } else {
         hex += "    ";
       }
@@ skipping 22 matching lines @@
     if (actual[i] != expected[i]) {
       marks[i] = true;
       identical = false;
     } else {
       marks[i] = false;
     }
   }
   for (int i = min_len; i < max_len; ++i) {
     marks[i] = true;
   }
-  if (identical) return;
-  ADD_FAILURE()
-      << "Description:\n"
-      << description
-      << "\n\nExpected:\n"
-      << HexDumpWithMarks(expected, expected_len, marks.get(), max_len)
-      << "\nActual:\n"
-      << HexDumpWithMarks(actual, actual_len, marks.get(), max_len);
+  if (identical)
+    return;
+  ADD_FAILURE() << "Description:\n"
+                << description << "\n\nExpected:\n"
+                << HexDumpWithMarks(expected, expected_len, marks.get(),
+                                    max_len)
+                << "\nActual:\n"
+                << HexDumpWithMarks(actual, actual_len, marks.get(), max_len);
 }
 
 void SetFrameFlags(SpdySerializedFrame* frame, uint8_t flags) {
   frame->data()[4] = flags;
 }
 
 void SetFrameLength(SpdySerializedFrame* frame, size_t length) {
   CHECK_GT(1u << 14, length);
   {
     int32_t wire_length = base::HostToNet32(length);
@@ skipping 68 matching lines @@
 bool TestServerPushDelegate::CancelPush(GURL url) {
   auto itr = push_helpers.find(url);
   DCHECK(itr != push_helpers.end());
   itr->second->Cancel();
   push_helpers.erase(itr);
   return true;
 }
 
 }  // namespace test
 }  // namespace net