Refactors offline page tab helper to stash the offline page item on redirect.

chrome/browser/android/offline_pages/offline_page_tab_helper.h

 // Copyright 2016 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.
 
 #ifndef CHROME_BROWSER_ANDROID_OFFLINE_PAGES_OFFLINE_PAGE_TAB_HELPER_H_
 #define CHROME_BROWSER_ANDROID_OFFLINE_PAGES_OFFLINE_PAGE_TAB_HELPER_H_
 
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
+#include "components/offline_pages/offline_page_types.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "content/public/browser/web_contents_user_data.h"
 #include "url/gurl.h"
 
 namespace content {
 class WebContents;
 }
 
 namespace offline_pages {
+struct OfflinePageItem;

[jianli, 2016/06/15 00:44:00]

nit: add an empty line

[dewittj, 2016/06/15 17:21:05]

Done.

 
 // Per-tab class to manage switch between online version and offline version.
 class OfflinePageTabHelper :
     public content::WebContentsObserver,
     public content::WebContentsUserData<OfflinePageTabHelper> {
  public:
   ~OfflinePageTabHelper() override;
 
+  const OfflinePageItem* offline_page() { return offline_page_.get(); }
+
  private:
+  enum class RedirectReason {
+    DISCONNECTED_NETWORK,
+    FLAKY_NETWORK,
+    FLAKY_NETWORK_FORWARD_BACK
+  };
+
   friend class content::WebContentsUserData<OfflinePageTabHelper>;
   friend class OfflinePageTabHelperTest;
   FRIEND_TEST_ALL_PREFIXES(OfflinePageTabHelperTest,
                            NewNavigationCancelsPendingRedirects);
 
   explicit OfflinePageTabHelper(content::WebContents* web_contents);
 
   // Overridden from content::WebContentsObserver:
   void DidStartNavigation(
       content::NavigationHandle* navigation_handle) override;
   void DidFinishNavigation(
       content::NavigationHandle* navigation_handle) override;
 
-  void GotRedirectURLForSupportedErrorCode(ui::PageTransition transition,
-                                           const GURL& from_url,
-                                           const GURL& redirect_url);
-  void GotRedirectURLForStartedNavigation(const GURL& from_url,
-                                          const GURL& redirect_url);
+  void RedirectToOnline(const GURL& from_url,
+                        const OfflinePageItem* offline_page);
+  void TryRedirectToOffline(RedirectReason redirect_reason,
+                            const GURL& from_url,
+                            const OfflinePageItem* offline_page);
 
-  void Redirect(const GURL& from_url, const GURL& to_url);
+  void Redirect(const GURL& from_url,
+                const GURL& to_url,
+                const OfflinePageItem* offline_page);
 
+  std::unique_ptr<OfflinePageItem> offline_page_;

[jianli, 2016/06/15 00:44:00]

Please comment this.

[dewittj, 2016/06/15 17:21:05]

Done.

   base::WeakPtrFactory<OfflinePageTabHelper> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(OfflinePageTabHelper);
 };
 
 }  // namespace offline_pages
 
 #endif  // CHROME_BROWSER_ANDROID_OFFLINE_PAGES_OFFLINE_PAGE_TAB_HELPER_H_