Minor cleanup to how infobars handle expiry:

chrome/browser/geolocation/chrome_geolocation_permission_context_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 <set>
 #include <string>
 #include <utility>
 
 #include "base/bind.h"
 #include "base/hash_tables.h"
@@ skipping 652 matching lines @@
   EXPECT_EQ(0U, infobar_service()->GetInfoBarCount());
   // Go back: navigate to a pending entry before requesting geolocation
   // permission.
   web_contents()->GetController().GoBack();
   // Request permission for the committed frame (not the pending one).
   RequestGeolocationPermission(RequestID(0), requesting_frame_1);
   // Ensure the infobar is created.
   ASSERT_EQ(1U, infobar_service()->GetInfoBarCount());
   InfoBarDelegate* infobar_0 = infobar_service()->GetInfoBarDelegateAt(0);
   ASSERT_TRUE(infobar_0);
-  // Ensure the infobar is not yet expired.
+  // Ensure the infobar wouldn't expire for a navigation to the committed entry.
   content::LoadCommittedDetails details;
   details.entry = web_contents()->GetController().GetLastCommittedEntry();
-  ASSERT_FALSE(infobar_0->ShouldExpire(details));
-  // Commit the "GoBack()" above, and ensure the infobar is now expired.
-  content::WebContentsTester::For(web_contents())->CommitPendingNavigation();
-  details.entry = web_contents()->GetController().GetLastCommittedEntry();
-  ASSERT_TRUE(infobar_0->ShouldExpire(details));
+  EXPECT_FALSE(infobar_0->ShouldExpire(details));
+  // Ensure the infobar will expire when we commit the pending navigation.
+  details.entry = web_contents()->GetController().GetActiveEntry();
+  EXPECT_TRUE(infobar_0->ShouldExpire(details));
 
   // Delete the tab contents.
   DeleteContents();
   infobar_0->InfoBarClosed();
 }