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 325 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) {
+  // For request desktop/mobile site, we want to reload the page with the
+  // original request url of the last non-redirect item (including pending item)
+  // because a redirect may either change the url of the current item or add a
+  // new item. For example, an user visits www.youtube.com and is then
+  // redirected to m.youtube.com, so in this case, we want to request desktop
+  // version of www.youtube.com for the user instead of m.youtube.com.
+  if (reload_type == web::ReloadType::ORIGINAL_REQUEST_URL) {
+    web::UserAgentType type =
+        [session_controller_ currentItem]->GetUserAgentType();
+    web::NavigationItem* last_non_redirect_item = nullptr;
+
+    if (GetPendingItem() && ((GetPendingItem()->GetTransitionType() &
+                              ui::PAGE_TRANSITION_IS_REDIRECT_MASK) == 0)) {
+      last_non_redirect_item = GetPendingItem();
+    } else {
+      DiscardNonCommittedItems();
+      int index = GetLastCommittedItemIndex();
+      while (index >= 0) {
+        if (!IsRedirectItemAtIndex(index)) {
+          last_non_redirect_item = GetItemAtIndex(index);
+          break;
+        }
+
+        [session_controller_ goToItemAtIndex:(index - 1)];
+        bool item_removed_successfuly = RemoveItemAtIndex(index);
+        DCHECK(item_removed_successfuly);
+
+        --index;
+      }
+    }
+
+    DCHECK(last_non_redirect_item);
+    last_non_redirect_item->SetURL(
+        last_non_redirect_item->GetOriginalRequestURL());
+    last_non_redirect_item->SetUserAgentType(type);
+  }
+
   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);

[liaoyuke, 2017/03/22 23:46:23]

I don't see any reason why index cannot be 0. Am I missing something?

[Eugene But (OOO till 7-30), 2017/03/23 00:08:19]

This was a bug :)

+  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 = GetCurrentItemIndex();
   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