Don't use custom load original logic for LitePageRedirect

Bug: 940510
Change-Id: I376004ebb9568c5f55f123a40011a592a52e546c
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1515237
Commit-Queue: Robert Ogden <robertogden@chromium.org>
Commit-Queue: Ryan Sturm <ryansturm@chromium.org>
Auto-Submit: Robert Ogden <robertogden@chromium.org>
Reviewed-by: Ryan Sturm <ryansturm@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#639567}(cherry picked from commit 426fd40152bb2931b7e6a086bf18071c46a8a84c)
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1518469
Reviewed-by: Robert Ogden <robertogden@chromium.org>
Cr-Commit-Position: refs/branch-heads/3729@{#52}
Cr-Branched-From: d4a8972-refs/heads/master@{#638880}

chrome/browser/previews/previews_ui_tab_helper.cc

@@ -98,22 +98,6 @@ bool ShouldShowUIForPreviewsType(previews::PreviewsType type) {
   return true;
 }
 
-void LoadOriginalForLitePageRedirect(content::WebContents* web_contents) {
-  std::string original_url;
-  bool extracted = previews::ExtractOriginalURLFromLitePageRedirectURL(
-      web_contents->GetController().GetLastCommittedEntry()->GetURL(),
-      &original_url);
-  ALLOW_UNUSED_LOCAL(extracted);
-  DCHECK(extracted);
-  content::OpenURLParams url_params(GURL(original_url), content::Referrer(),
-                                    WindowOpenDisposition::CURRENT_TAB,
-                                    ui::PAGE_TRANSITION_RELOAD,
-                                    false /* is_render_initiated */);
-  url_params.user_gesture = true;
-  url_params.started_from_context_menu = false;
-  web_contents->OpenURL(url_params);
-}
-
 }  // namespace
 
 PreviewsUITabHelper::~PreviewsUITabHelper() {
@@ -240,6 +224,7 @@ void PreviewsUITabHelper::ReloadWithoutPreviews(
     case previews::PreviewsType::OFFLINE:
     case previews::PreviewsType::NOSCRIPT:
     case previews::PreviewsType::RESOURCE_LOADING_HINTS:
+    case previews::PreviewsType::LITE_PAGE_REDIRECT:
       // Previews may cause a redirect, so we should use the original URL. The
       // black list prevents showing the preview again.
       web_contents()->GetController().Reload(
@@ -248,9 +233,6 @@ void PreviewsUITabHelper::ReloadWithoutPreviews(
     case previews::PreviewsType::LOFI:
       web_contents()->ReloadLoFiImages();
       break;
-    case previews::PreviewsType::LITE_PAGE_REDIRECT:
-      LoadOriginalForLitePageRedirect(web_contents());
-      break;
     case previews::PreviewsType::NONE:
     case previews::PreviewsType::UNSPECIFIED:
     case previews::PreviewsType::LAST: