predictors: Clean up after removing STLDeleteContainerPairFirstPointers

chrome/browser/predictors/resource_prefetcher_unittest.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/predictors/resource_prefetcher.h"
 
 #include <stddef.h>
 
 #include <memory>
 #include <utility>
@@ skipping 88 matching lines @@
 
   void CheckPrefetcherState(size_t inflight, size_t queue, size_t host) {
     EXPECT_EQ(prefetcher_->inflight_requests_.size(), inflight);
     EXPECT_EQ(prefetcher_->request_queue_.size(), queue);
     EXPECT_EQ(prefetcher_->host_inflight_counts_.size(), host);
   }
 
   net::URLRequest* GetInFlightRequest(const std::string& url_str) {
     GURL url(url_str);
 
-    for (auto it = prefetcher_->request_queue_.begin();
-         it != prefetcher_->request_queue_.end(); ++it) {
-      EXPECT_NE((*it)->resource_url, url);
+    for (auto* request : prefetcher_->request_queue_) {
+      EXPECT_NE(request->resource_url, url);
     }
-    for (auto it = prefetcher_->inflight_requests_.begin();
-         it != prefetcher_->inflight_requests_.end(); ++it) {
-      if (it->first->original_url() == url)
-        return it->first;
+    for (const auto& it : prefetcher_->inflight_requests_) {

[Benoit L, 2016/09/02 10:44:12]

nit: "it" is a bit misleading here, I usually use p or something else. Which is
also not really explicit, but it doesn't imply that it's an iterator.

[pasko, 2016/09/02 10:51:10]

Agreed. Changed to key_value, still lgty?

+      if (it.first->original_url() == url)
+        return it.first;
     }
-    EXPECT_TRUE(false) << "Inflight request not found: " << url_str;
+    EXPECT_TRUE(false) << "In flight request not found: " << url_str;
     return NULL;
   }
 
 
   void OnReceivedRedirect(const std::string& url) {
     prefetcher_->OnReceivedRedirect(
         GetInFlightRequest(url), net::RedirectInfo(), NULL);
   }
   void OnAuthRequired(const std::string& url) {
     prefetcher_->OnAuthRequired(GetInFlightRequest(url), NULL);
@@ skipping 220 matching lines @@
   // We need to delete requests_ptr here, though it looks to be managed by the
   // scoped_ptr requests. The scoped_ptr requests releases itself and the raw
   // pointer requests_ptr is passed to ResourcePrefetcherFinished(). In the
   // test, ResourcePrefetcherFinished() is a mock function and does not handle
   // the raw pointer properly. In the real code, requests_ptr will eventually be
   // passed to and managed by ResourcePrefetchPredictor::Result::Result.
   delete requests_ptr;
 }
 
 }  // namespace predictors