Fix shadowed variables in the content layer.

Shadowed variables can make code harder to read. Don't support them
in the content layer.

BUG=794619

This CL was uploaded by git cl split.

R=csharrison@chromium.org

Change-Id: Ia68095876eb2a6de4337cee243c0ae5b4c93ff8c
Reviewed-on: https://chromium-review.googlesource.com/924171
Commit-Queue: Dave Tapuska <dtapuska@chromium.org>
Commit-Queue: Charlie Harrison <csharrison@chromium.org>
Reviewed-by: Charlie Harrison <csharrison@chromium.org>
Cr-Commit-Position: refs/heads/master@{#537344}

content/browser/loader/resource_dispatcher_host_impl.cc

@@ -1670,8 +1670,8 @@ void ResourceDispatcherHostImpl::CancelRequestsForRoute(
       if (blocked_loaders.first.child_id == child_id)
         routing_ids.insert(blocked_loaders.first);
     }
-    for (const GlobalFrameRoutingId& route_id : routing_ids) {
-      CancelBlockedRequestsForRoute(route_id);
+    for (const GlobalFrameRoutingId& frame_route_id : routing_ids) {
+      CancelBlockedRequestsForRoute(frame_route_id);
     }
   }
 }

content/browser/loader/signed_exchange_signature_verifier.cc

@@ -70,13 +70,13 @@ base::Optional<cbor::CBORValue> GenerateCanonicalResponseCBOR(
       cbor::CBORValue(response_code_str, cbor::CBORValue::Type::BYTE_STRING));
 
   for (const std::string& name : *signed_headers) {
-    auto it = headers.find(name);
-    if (it == headers.end()) {
+    auto headers_it = headers.find(name);
+    if (headers_it == headers.end()) {
       DVLOG(1) << "Signed header \"" << name
                << "\" expected, but not found in response_headers.";
       return base::nullopt;
     }
-    const std::string& value = it->second;
+    const std::string& value = headers_it->second;
     map.insert_or_assign(
         cbor::CBORValue(name, cbor::CBORValue::Type::BYTE_STRING),
         cbor::CBORValue(value, cbor::CBORValue::Type::BYTE_STRING));