Implement Reload for ORIGINAL_REQUEST_URL in NavigationManagerImpl.

ios/web/navigation/navigation_manager_impl.mm

 // Copyright 2013 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.
 
 #import "ios/web/navigation/navigation_manager_impl.h"
 
 #include <stddef.h>
 
 #include <utility>
 
@@ skipping 321 matching lines @@
 NavigationItemList NavigationManagerImpl::GetBackwardItems() const {
   return [session_controller_ backwardItems];
 }
 
 NavigationItemList NavigationManagerImpl::GetForwardItems() const {
   return [session_controller_ forwardItems];
 }
 
 void NavigationManagerImpl::Reload(ReloadType reload_type,
                                    bool check_for_reposts) {
+  if (!GetTransientItem() && !GetPendingItem() && !GetLastCommittedItem())
+    return;
+
+  // Reload with ORIGINAL_REQUEST_URL type should reload with the original
+  // request url of the transient item, or pending item if transient doesn't
+  // exist, or last committed item if both of them don't exist. The reason is
+  // that a server side redirect may change the item's url.
+  // For example, the user visits www.chromium.org and is then redirected
+  // to m.chromium.org, when the user wants to refresh the page with a different
+  // configuration (e.g. user agent), the user would be expecting to visit
+  // www.chromium.org instead of m.chromium.org.
+  if (reload_type == web::ReloadType::ORIGINAL_REQUEST_URL) {
+    NavigationItem* reload_item = nullptr;
+    if (GetTransientItem())
+      reload_item = GetTransientItem();
+    else if (GetPendingItem())
+      reload_item = GetPendingItem();
+    else
+      reload_item = GetLastCommittedItem();

[kkhorimoto, 2017/03/28 18:10:17]

So are we no longer using the last user item logic?  What's the explanation for
this change in behavior?

+    DCHECK(reload_item);
+
+    reload_item->SetURL(reload_item->GetOriginalRequestURL());
+  }
+
   delegate_->Reload();
 }
 
 void NavigationManagerImpl::CopyStateFromAndPrune(
     const NavigationManager* manager) {
   DCHECK(manager);
   CRWSessionController* other_session =
       static_cast<const NavigationManagerImpl*>(manager)->session_controller_;
   [session_controller_ copyStateFromSessionControllerAndPrune:other_session];
 }
@@ skipping 75 matching lines @@
     // The desktop user agent cannot be used for a pending navigation to an
     // app-specific URL.
     DCHECK_NE(pending_item->GetUserAgentType(), UserAgentType::NONE);
     pending_item->SetUserAgentType(UserAgentType::DESKTOP);
   } else {
     override_desktop_user_agent_for_next_pending_item_ = true;
   }
 }
 
 bool NavigationManagerImpl::IsRedirectItemAtIndex(int index) const {
-  DCHECK_GT(index, 0);
+  DCHECK_GE(index, 0);
   DCHECK_LT(index, GetItemCount());
   ui::PageTransition transition = GetItemAtIndex(index)->GetTransitionType();
   return transition & ui::PAGE_TRANSITION_IS_REDIRECT_MASK;
 }
 
 NavigationItem* NavigationManagerImpl::GetLastCommittedNonAppSpecificItem()
     const {
   int index = GetLastCommittedItemIndex();
   if (index == -1)
     return nullptr;
   WebClient* client = GetWebClient();
   const ScopedNavigationItemImplList& items = [session_controller_ items];
   while (index >= 0) {
     NavigationItem* item = items[index--].get();
     if (!client->IsAppSpecificURL(item->GetVirtualURL()))
       return item;
   }
   return nullptr;
 }
 
 }  // namespace web