Change next_proto member type.

net/socket/ssl_client_socket.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/socket/ssl_client_socket.h"
 
 #include "base/metrics/histogram.h"
 #include "base/metrics/sparse_histogram.h"
 #include "base/strings/string_util.h"
 #include "crypto/ec_private_key.h"
@@ skipping 217 matching lines @@
   if (!channel_id_service->IsSystemTimeValid()) {
     DVLOG(1) << "System time is not within the supported range for certificate "
                 "generation, not enabling channel ID.";
     return false;
   }
   return true;
 }
 
 // static
 std::vector<uint8_t> SSLClientSocket::SerializeNextProtos(
-    const std::vector<std::string>& next_protos) {
+    const NextProtoVector& next_protos) {
   // Do a first pass to determine the total length.
   size_t wire_length = 0;
-  for (std::vector<std::string>::const_iterator i = next_protos.begin();
-       i != next_protos.end(); ++i) {
-    if (i->size() > 255) {
-      LOG(WARNING) << "Ignoring overlong NPN/ALPN protocol: " << *i;
+  std::vector<std::string> next_proto_strings;
+  for (const auto& it : next_protos) {

[Ryan Hamilton, 2014/12/10 20:09:00]

Prefer using the actual type to auto if the type is short/simple.

for (const NextProto next_proto : next_protos) {
}


(It's not actually an iterator, right?)

[Bence, 2014/12/10 22:01:23]

Done.

+    const std::string proto = NextProtoToString(it);
+    if (proto.size() > 255) {
+      LOG(WARNING) << "Ignoring overlong NPN/ALPN protocol: " << proto;
       continue;
     }
-    if (i->size() == 0) {
+    if (proto.size() == 0) {
       LOG(WARNING) << "Ignoring empty NPN/ALPN protocol";
       continue;
     }
-    wire_length += i->size();
+    next_proto_strings.push_back(proto);
+    wire_length += proto.size();
     wire_length++;
   }
 
   // Allocate memory for the result and fill it in.
   std::vector<uint8_t> wire_protos;
   wire_protos.reserve(wire_length);
-  for (std::vector<std::string>::const_iterator i = next_protos.begin();
-       i != next_protos.end(); i++) {
-    if (i->size() == 0 || i->size() > 255)
-      continue;
-    wire_protos.push_back(i->size());
-    wire_protos.resize(wire_protos.size() + i->size());
-    memcpy(&wire_protos[wire_protos.size() - i->size()],
-           i->data(), i->size());
+  for (const auto& it : next_proto_strings) {

[Ryan Hamilton, 2014/12/10 20:09:00]

ditto.

[Bence, 2014/12/10 22:01:23]

Done.

+    wire_protos.push_back(it.size());
+    wire_protos.resize(wire_protos.size() + it.size());
+    memcpy(&wire_protos[wire_protos.size() - it.size()], it.data(), it.size());

[Ryan Hamilton, 2014/12/10 20:09:00]

This code (which you did not write) looks completely insane :>

Can you add a todo to possibly rewrite this? And in the meantime, can you add a
comment to explain what it's doing?

[Bence, 2014/12/10 22:01:23]

Done.

   }
   DCHECK_EQ(wire_protos.size(), wire_length);
 
   return wire_protos;
 }
 
 void SSLClientSocket::RecordNegotiationExtension() {
   if (negotiation_extension_ == kExtensionUnknown)
     return;
   std::string proto;
@@ skipping 13 matching lines @@
     } else {
       sample += 500;
     }
   } else {
     DCHECK_EQ(kExtensionALPN, negotiation_extension_);
   }
   UMA_HISTOGRAM_SPARSE_SLOWLY("Net.SSLProtocolNegotiation", sample);
 }
 
 }  // namespace net