win vs2015: fix variable shadowing warnings in net/quic

net/quic/crypto/strike_register.cc

 // Copyright (c) 2013 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/quic/crypto/strike_register.h"
 
 #include <limits>
 
 #include "base/logging.h"
 
@@ skipping 477 matching lines @@
 
   CHECK_EQ(free_internal_nodes.count(internal_node), 0u);
 
   for (unsigned child = 0; child < 2; child++) {
     if (i->child(child) & kExternalFlag) {
       uint32 ext = i->child(child) & ~kExternalFlag;
       CHECK_EQ(free_external_nodes.count(ext), 0u);
       CHECK_EQ(used_external_nodes->count(ext), 0u);
       used_external_nodes->insert(ext);
       const uint8* bytes = external_node(ext);
-      for (vector<pair<unsigned, bool> >::const_iterator i = bits.begin();
-           i != bits.end(); i++) {
-        unsigned byte = i->first / 8;
+      for (vector<pair<unsigned, bool>>::const_iterator j = bits.begin();
+           j != bits.end(); j++) {
+        unsigned byte = j->first / 8;
         DCHECK_LE(byte, 0xffu);
-        unsigned bit = i->first % 8;
+        bit = j->first % 8;

[ramant (doing other things), 2015/02/20 20:04:07]

IMO, we should define a "unsigned bit_new = ..." and use that. We shouldn't
modify the original bit. Sorry to have missed that (to keep the logic same as
before).

Will fix it in the next cl. This code is not used in chromium's clise side code.

[scottmg, 2015/02/20 20:30:51]

Shoot, I didn't notice it might be used in the else arm without going here
first. Fix here: https://codereview.chromium.org/946003003

         static const uint8 kMasks[8] =
             {0x80, 0x40, 0x20, 0x10, 0x08, 0x04, 0x02, 0x01};
-        CHECK_EQ((bytes[byte] & kMasks[bit]) != 0, i->second);
+        CHECK_EQ((bytes[byte] & kMasks[bit]) != 0, j->second);
       }
     } else {
       uint32 inter = i->child(child);
       vector<pair<unsigned, bool> > new_bits(bits);
       new_bits.push_back(pair<unsigned, bool>(bit, child != 0));
       CHECK_EQ(free_internal_nodes.count(inter), 0u);
       CHECK_EQ(used_internal_nodes->count(inter), 0u);
       used_internal_nodes->insert(inter);
       ValidateTree(inter, bit, bits, free_internal_nodes, free_external_nodes,
                    used_internal_nodes, used_external_nodes);
     }
   }
 }
 
 }  // namespace net