win vs2015: fix variable shadowing warnings in net/quic

net/quic/crypto/strike_register.cc

Index: net/quic/crypto/strike_register.cc
diff --git a/net/quic/crypto/strike_register.cc b/net/quic/crypto/strike_register.cc
index c36d3701ae48d10558f7b340232f1d0c201fbb37..702db7e9b46a22f467d56a23d7fbfcc23ea00c58 100644
--- a/net/quic/crypto/strike_register.cc
+++ b/net/quic/crypto/strike_register.cc
@@ -495,14 +495,14 @@ void StrikeRegister::ValidateTree(
       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);