Use proper pair type in range-based for map iterations.

chrome/browser/history/expire_history_backend_unittest.cc

 // Copyright (c) 2012 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 <algorithm>
 #include <string>
 #include <utility>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
@@ skipping 315 matching lines @@
   // There should be no visits.
   VisitVector visits;
   main_db_->GetVisitsForURL(row.id(), &visits);
   EXPECT_EQ(0U, visits.size());
 
   // Thumbnail should be gone.
   // TODO(sky): fix this, see comment in HasThumbnail.
   // EXPECT_FALSE(HasThumbnail(row.id()));
 
   bool found_delete_notification = false;
-  for (const std::pair<bool, URLRows>& pair : urls_deleted_notifications_) {
+  for (const URLsDeletedNotificationList::value_type& pair :

[sdefresne, 2015/01/14 10:47:08]

nit: I slightly prefer const auto& here.

[vmpstr, 2015/01/14 17:32:16]

Done.

+       urls_deleted_notifications_) {
     EXPECT_EQ(expired, pair.first);
     const history::URLRows& rows(pair.second);
     history::URLRows::const_iterator it_row = std::find_if(
         rows.begin(), rows.end(), history::URLRow::URLRowHasURL(row.url()));
     if (it_row != rows.end()) {
       // Further verify that the ID is set to what had been in effect in the
       // main database before the deletion. The InMemoryHistoryBackend relies
       // on this to delete its cached copy of the row.
       EXPECT_EQ(row.id(), it_row->id());
       found_delete_notification = true;
@@ skipping 527 matching lines @@
   EXPECT_TRUE(all->Read(now, main_db_.get(), &visits, 1));
   EXPECT_EQ(1U, visits.size());
 }
 
 // TODO(brettw) add some visits with no URL to make sure everything is updated
 // properly. Have the visits also refer to nonexistent FTS rows.
 //
 // Maybe also refer to invalid favicons.
 
 }  // namespace history