--- a/security/sandbox/linux/gtest/TestBroker.cpp
+++ b/security/sandbox/linux/gtest/TestBroker.cpp
@@ -101,22 +101,22 @@ protected:
     ASSERT_EQ(0, pthread_create(aThread, nullptr, ThreadMain<C, Main>,
                                 static_cast<C*>(this)));
   }
 
   template<class C, void (C::* Main)()>
   void RunOnManyThreads() {
     static const int kNumThreads = 5;
     pthread_t threads[kNumThreads];
-    for (int i = 0; i < kNumThreads; ++i) {
-      StartThread<C, Main>(&threads[i]);
+    for (pthread_t & thread : threads) {
+      StartThread<C, Main>(&thread);
     }
-    for (int i = 0; i < kNumThreads; ++i) {
+    for (pthread_t thread : threads) {
       void* retval;
-      ASSERT_EQ(pthread_join(threads[i], &retval), 0);
+      ASSERT_EQ(pthread_join(thread, &retval), 0);
       ASSERT_EQ(retval, static_cast<void*>(nullptr));
     }
   }
 
 public:
   void MultiThreadOpenWorker();
   void MultiThreadStatWorker();
 };