More infobar cleanup.

ios/chrome/browser/infobars/infobar_manager_impl.cc

Index: ios/chrome/browser/infobars/infobar_manager_impl.cc
diff --git a/ios/chrome/browser/infobars/infobar_manager_impl.cc b/ios/chrome/browser/infobars/infobar_manager_impl.cc
index a3ed407911532d87b1e1ee7e7db35712ab827797..55eecccdd102380dca3c426e97b6e68043ebbbb6 100644
--- a/ios/chrome/browser/infobars/infobar_manager_impl.cc
+++ b/ios/chrome/browser/infobars/infobar_manager_impl.cc
@@ -21,18 +21,14 @@ namespace {
 infobars::InfoBarDelegate::NavigationDetails
 NavigationDetailsFromLoadCommittedDetails(
     const web::LoadCommittedDetails& load_details) {
-  const ui::PageTransition transition = load_details.item->GetTransitionType();
   infobars::InfoBarDelegate::NavigationDetails navigation_details;

[Peter Kasting, 2015/06/05 03:02:39]

I reordered the code here so as to match the similar code in infobar_service.cc
as closely as possible.

-  navigation_details.is_main_frame = ui::PageTransitionIsMainFrame(transition);
-  navigation_details.is_redirect = ui::PageTransitionIsRedirect(transition);
-  navigation_details.is_reload =
-      ui::PageTransitionCoreTypeIs(transition, ui::PAGE_TRANSITION_RELOAD);
-
-  // web::LoadCommittedDetails don't store this information, default to false.
-  navigation_details.did_replace_entry = false;
   navigation_details.entry_id = load_details.item->GetUniqueID();
+  const ui::PageTransition transition = load_details.item->GetTransitionType();
   navigation_details.is_navigation_to_different_page =
-      navigation_details.is_main_frame && !load_details.is_in_page;
+      ui::PageTransitionIsMainFrame(transition) && !load_details.is_in_page;
+  // web::LoadCommittedDetails doesn't store this information, default to false.
+  navigation_details.did_replace_entry = false;
+  navigation_details.is_redirect = ui::PageTransitionIsRedirect(transition);
 
   return navigation_details;
 }