Fix some instances of -Wshadow.

Bug: 794619
Change-Id: I348ed50ddf41076ae973d2feee1a82af7aa6fc3b
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3135532
Reviewed-by: Evan Stade <estade@chromium.org>
Reviewed-by: Justin Novosad <junov@chromium.org>
Reviewed-by: Trent Apted <tapted@chromium.org>
Reviewed-by: Daniel Cheng <dcheng@chromium.org>
Commit-Queue: Daniel Cheng <dcheng@chromium.org>
Auto-Submit: Peter Kasting <pkasting@chromium.org>
Cr-Commit-Position: refs/heads/main@{#917977}

apps/saved_files_service.cc

@@ -305,10 +305,10 @@ void SavedFilesService::SavedFiles::RegisterFileEntry(
 }
 
 void SavedFilesService::SavedFiles::EnqueueFileEntry(const std::string& id) {
-  auto it = registered_file_entries_.find(id);
-  DCHECK(it != registered_file_entries_.end());
+  auto id_it = registered_file_entries_.find(id);
+  DCHECK(id_it != registered_file_entries_.end());
 
-  SavedFileEntry* file_entry = it->second.get();
+  SavedFileEntry* file_entry = id_it->second.get();
   int old_sequence_number = file_entry->sequence_number;
 
 #if BUILDFLAG(IS_CHROMEOS_ASH)
@@ -380,14 +380,14 @@ void SavedFilesService::SavedFiles::MaybeCompactSequenceNumbers() {
   DCHECK_GE(g_max_sequence_number, 0);
   DCHECK_GE(static_cast<size_t>(g_max_sequence_number),
             g_max_saved_file_entries);
-  std::map<int, SavedFileEntry*>::reverse_iterator it =
+  std::map<int, SavedFileEntry*>::reverse_iterator last_it =
       saved_file_lru_.rbegin();
-  if (it == saved_file_lru_.rend())
+  if (last_it == saved_file_lru_.rend())
     return;
 
   // Only compact sequence numbers if the last entry's sequence number is the
   // maximum value.  This should almost never be the case.
-  if (it->first < g_max_sequence_number)
+  if (last_it->first < g_max_sequence_number)
     return;
 
   int sequence_number = 0;

base/test/launcher/test_results_tracker.cc

@@ -263,10 +263,8 @@ void TestResultsTracker::AddTestResult(const TestResult& result) {
   if (test_name_without_pre_prefix != test_name_without_disabled_prefix) {
     if (result.status != TestResult::TEST_SUCCESS) {
       it = results_map.find(test_name_without_pre_prefix);
-      AggregateTestResult& aggregate_test_result = it->second;
-      if (!aggregate_test_result.test_results.empty() &&
-          aggregate_test_result.test_results.back().status ==
-              TestResult::TEST_NOT_RUN) {
+      if (!it->second.test_results.empty() &&
+          it->second.test_results.back().status == TestResult::TEST_NOT_RUN) {
         // Also need to remove the non-PRE test's placeholder.
         it->second.test_results.pop_back();
       }

base/test/trace_event_analyzer.cc

@@ -209,79 +209,79 @@ double TraceEvent::GetAbsTimeToOtherEvent() const {
   return fabs(other_event->timestamp - timestamp);
 }
 
-bool TraceEvent::GetArgAsString(const std::string& name,
+bool TraceEvent::GetArgAsString(const std::string& arg_name,
                                 std::string* arg) const {
-  const auto it = arg_strings.find(name);
+  const auto it = arg_strings.find(arg_name);
   if (it != arg_strings.end()) {
     *arg = it->second;
     return true;
   }
   return false;
 }
 
-bool TraceEvent::GetArgAsNumber(const std::string& name,
+bool TraceEvent::GetArgAsNumber(const std::string& arg_name,
                                 double* arg) const {
-  const auto it = arg_numbers.find(name);
+  const auto it = arg_numbers.find(arg_name);
   if (it != arg_numbers.end()) {
     *arg = it->second;
     return true;
   }
   return false;
 }
 
-bool TraceEvent::GetArgAsValue(const std::string& name,
+bool TraceEvent::GetArgAsValue(const std::string& arg_name,
                                base::Value* arg) const {
-  const auto it = arg_values.find(name);
+  const auto it = arg_values.find(arg_name);
   if (it != arg_values.end()) {
     *arg = it->second.Clone();
     return true;
   }
   return false;
 }
 
-bool TraceEvent::HasStringArg(const std::string& name) const {
-  return (arg_strings.find(name) != arg_strings.end());
+bool TraceEvent::HasStringArg(const std::string& arg_name) const {
+  return (arg_strings.find(arg_name) != arg_strings.end());
 }
 
-bool TraceEvent::HasNumberArg(const std::string& name) const {
-  return (arg_numbers.find(name) != arg_numbers.end());
+bool TraceEvent::HasNumberArg(const std::string& arg_name) const {
+  return (arg_numbers.find(arg_name) != arg_numbers.end());
 }
 
-bool TraceEvent::HasArg(const std::string& name) const {
-  return (arg_values.find(name) != arg_values.end());
+bool TraceEvent::HasArg(const std::string& arg_name) const {
+  return (arg_values.find(arg_name) != arg_values.end());
 }
 
-std::string TraceEvent::GetKnownArgAsString(const std::string& name) const {
+std::string TraceEvent::GetKnownArgAsString(const std::string& arg_name) const {
   std::string arg_string;
-  bool result = GetArgAsString(name, &arg_string);
+  bool result = GetArgAsString(arg_name, &arg_string);
   DCHECK(result);
   return arg_string;
 }
 
-double TraceEvent::GetKnownArgAsDouble(const std::string& name) const {
+double TraceEvent::GetKnownArgAsDouble(const std::string& arg_name) const {
   double arg_double = 0;
-  bool result = GetArgAsNumber(name, &arg_double);
+  bool result = GetArgAsNumber(arg_name, &arg_double);
   DCHECK(result);
   return arg_double;
 }
 
-int TraceEvent::GetKnownArgAsInt(const std::string& name) const {
+int TraceEvent::GetKnownArgAsInt(const std::string& arg_name) const {
   double arg_double = 0;
-  bool result = GetArgAsNumber(name, &arg_double);
+  bool result = GetArgAsNumber(arg_name, &arg_double);
   DCHECK(result);
   return static_cast<int>(arg_double);
 }
 
-bool TraceEvent::GetKnownArgAsBool(const std::string& name) const {
+bool TraceEvent::GetKnownArgAsBool(const std::string& arg_name) const {
   double arg_double = 0;
-  bool result = GetArgAsNumber(name, &arg_double);
+  bool result = GetArgAsNumber(arg_name, &arg_double);
   DCHECK(result);
   return (arg_double != 0.0);
 }
 
-base::Value TraceEvent::GetKnownArgAsValue(const std::string& name) const {
+base::Value TraceEvent::GetKnownArgAsValue(const std::string& arg_name) const {
   base::Value arg_value;
-  bool result = GetArgAsValue(name, &arg_value);
+  bool result = GetArgAsValue(arg_name, &arg_value);
   DCHECK(result);
   return arg_value;
 }

base/test/trace_event_analyzer.h

@@ -147,27 +147,27 @@ struct TraceEvent {
   double GetAbsTimeToOtherEvent() const;
 
   // Return the argument value if it exists and it is a string.
-  bool GetArgAsString(const std::string& name, std::string* arg) const;
+  bool GetArgAsString(const std::string& arg_name, std::string* arg) const;
   // Return the argument value if it exists and it is a number.
-  bool GetArgAsNumber(const std::string& name, double* arg) const;
+  bool GetArgAsNumber(const std::string& arg_name, double* arg) const;
   // Return the argument value if it exists.
-  bool GetArgAsValue(const std::string& name, base::Value* arg) const;
+  bool GetArgAsValue(const std::string& arg_name, base::Value* arg) const;
 
   // Check if argument exists and is string.
-  bool HasStringArg(const std::string& name) const;
+  bool HasStringArg(const std::string& arg_name) const;
   // Check if argument exists and is number (double, int or bool).
-  bool HasNumberArg(const std::string& name) const;
+  bool HasNumberArg(const std::string& arg_name) const;
   // Check if argument exists.
-  bool HasArg(const std::string& name) const;
+  bool HasArg(const std::string& arg_name) const;
 
   // Get known existing arguments as specific types.
   // Useful when you have already queried the argument with
   // Query(HAS_NUMBER_ARG) or Query(HAS_STRING_ARG).
-  std::string GetKnownArgAsString(const std::string& name) const;
-  double GetKnownArgAsDouble(const std::string& name) const;
-  int GetKnownArgAsInt(const std::string& name) const;
-  bool GetKnownArgAsBool(const std::string& name) const;
-  base::Value GetKnownArgAsValue(const std::string& name) const;
+  std::string GetKnownArgAsString(const std::string& arg_name) const;
+  double GetKnownArgAsDouble(const std::string& arg_name) const;
+  int GetKnownArgAsInt(const std::string& arg_name) const;
+  bool GetKnownArgAsBool(const std::string& arg_name) const;
+  base::Value GetKnownArgAsValue(const std::string& arg_name) const;
 
   // Process ID and Thread ID.
   ProcessThreadID thread;

third_party/blink/renderer/platform/graphics/graphics_context_test.cc

@@ -103,7 +103,7 @@ TEST(GraphicsContextTest, UnboundedDrawsAreClipped) {
   SkiaPaintCanvas canvas(bitmap);
 
   Color opaque(1.0f, 0.0f, 0.0f, 1.0f);
-  Color alpha(0.0f, 0.0f, 0.0f, 0.0f);
+  Color transparent(0.0f, 0.0f, 0.0f, 0.0f);
   FloatRect bounds(0, 0, 100, 100);
 
   auto paint_controller = std::make_unique<PaintController>();
@@ -137,7 +137,7 @@ TEST(GraphicsContextTest, UnboundedDrawsAreClipped) {
   path.MoveTo(FloatPoint(10, 10));
   path.AddLineTo(FloatPoint(40, 40));
   PaintFlags flags;
-  flags.setColor(alpha.Rgb());
+  flags.setColor(transparent.Rgb());
   flags.setBlendMode(SkBlendMode::kSrcOut);
   context.DrawPath(path.GetSkPath(), flags);
 

weblayer/browser/persistence/browser_persister_file_utils.cc

@@ -22,15 +22,15 @@ namespace weblayer {
 namespace {
 
 bool RemoveBrowserPersistenceStorageOnBackgroundThread(
-    const base::FilePath& path,
+    const base::FilePath& database_dir,
     base::flat_set<std::string> ids) {
   DCHECK(!content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
   bool all_succeeded = true;
   for (const std::string& id : ids) {
     DCHECK(!id.empty());
     // Original persistence path.
     const base::FilePath persistence_path =
-        BuildBasePathForBrowserPersister(path, id);
+        BuildBasePathForBrowserPersister(database_dir, id);
     if (!base::DeleteFile(persistence_path))
       all_succeeded = false;