Fix -Wshadow instances: media/

Bug: 794619
Change-Id: I96f18357e541c19ee4d3fdc5d4316715e95e7d2d
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3257902
Auto-Submit: Peter Kasting <pkasting@chromium.org>
Commit-Queue: Dale Curtis <dalecurtis@chromium.org>
Reviewed-by: Dale Curtis <dalecurtis@chromium.org>
Cr-Commit-Position: refs/heads/main@{#937443}
NOKEYCHECK=True
GitOrigin-RevId: 37e7b6ea2398f259865d9d3d9deac6f0f49d3b44
diff --git a/midi_manager_alsa.cc b/midi_manager_alsa.cc
index 450f47e..2a8f924 100644
--- a/midi_manager_alsa.cc
+++ b/midi_manager_alsa.cc
@@ -822,10 +822,10 @@
     int result = snd_midi_event_encode_byte(encoder.get(), datum, &event);
     if (result == 1) {
       // Full event, send it.
-      base::AutoLock lock(out_ports_lock_);
+      base::AutoLock ports_lock(out_ports_lock_);
       auto it = out_ports_.find(port_index);
       if (it != out_ports_.end()) {
-        base::AutoLock lock(out_client_lock_);
+        base::AutoLock client_lock(out_client_lock_);
         if (!out_client_)
           return;
         snd_seq_ev_set_source(&event, it->second);
@@ -1113,9 +1113,9 @@
   snd_ctl_close(handle);
 
   if (midi_count > 0) {
-    std::unique_ptr<AlsaCard> card(
-        new AlsaCard(dev, name, longname, driver, midi_count));
-    alsa_cards_.insert(std::make_pair(number, std::move(card)));
+    auto alsa_card =
+        std::make_unique<AlsaCard>(dev, name, longname, driver, midi_count);
+    alsa_cards_.insert(std::make_pair(number, std::move(alsa_card)));
     alsa_card_midi_count_ += midi_count;
   }
 }