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

chrome/browser/android/offline_pages/offline_page_tab_helper_unittest.cc

 // 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.
 
 #include "chrome/browser/android/offline_pages/offline_page_tab_helper.h"
 
 #include <memory>
 
 #include "base/bind.h"
 #include "base/feature_list.h"
 #include "base/files/file_path.h"
 #include "base/memory/weak_ptr.h"
 #include "base/run_loop.h"
 #include "base/test/histogram_tester.h"
 #include "chrome/browser/android/offline_pages/offline_page_model_factory.h"
+#include "chrome/browser/android/offline_pages/offline_page_utils.h"
 #include "chrome/browser/android/offline_pages/test_offline_page_model_builder.h"
 #include "chrome/test/base/chrome_render_view_host_test_harness.h"
 #include "components/offline_pages/client_namespace_constants.h"
 #include "components/offline_pages/offline_page_feature.h"
 #include "components/offline_pages/offline_page_item.h"
 #include "components/offline_pages/offline_page_model.h"
 #include "components/offline_pages/offline_page_test_archiver.h"
 #include "components/offline_pages/offline_page_types.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/web_contents.h"
@@ skipping 47 matching lines @@
 
   void RunUntilIdle();
   void SimulateHasNetworkConnectivity(bool has_connectivity);
   void StartLoad(const GURL& url);
   void FailLoad(const GURL& url);
 
   OfflinePageTabHelper* offline_page_tab_helper() const {
     return offline_page_tab_helper_;
   }
 
-  const GURL& online_url() const { return online_url_; }
-  const GURL& offline_url() const { return offline_url_; }
+  const GURL& online_url() const { return offline_page_item_->url; }
+  GURL offline_url() const { return offline_page_item_->GetOfflineURL(); }
 
   const base::HistogramTester& histograms() const { return histogram_tester_; }
 
  private:
   // OfflinePageTestArchiver::Observer implementation:
   void SetLastPathCreatedByArchiver(const base::FilePath& file_path) override;
 
   std::unique_ptr<OfflinePageTestArchiver> BuildArchiver(
       const GURL& url,
       const base::FilePath& file_name);
   void OnSavePageDone(SavePageResult result, int64_t offline_id);
   void OnGetPageByOfflineIdDone(const OfflinePageItem* result);
 
   std::unique_ptr<TestNetworkChangeNotifier> network_change_notifier_;
   OfflinePageTabHelper* offline_page_tab_helper_;  // Not owned.
 
-  GURL online_url_;
-  GURL offline_url_;
+  std::unique_ptr<OfflinePageItem> offline_page_item_;
 
   base::HistogramTester histogram_tester_;
 
   DISALLOW_COPY_AND_ASSIGN(OfflinePageTabHelperTest);
 };
 
 void OfflinePageTabHelperTest::SetUp() {
   // Enables offline pages feature.
   // TODO(jianli): Remove this once the feature is completely enabled.
   base::FeatureList::ClearInstanceForTesting();
@@ skipping 73 matching lines @@
   OfflinePageModel* model =
       OfflinePageModelFactory::GetForBrowserContext(browser_context());
   model->GetPageByOfflineId(offline_id,
       base::Bind(&OfflinePageTabHelperTest::OnGetPageByOfflineIdDone,
                  AsWeakPtr()));
 }
 
 void OfflinePageTabHelperTest::OnGetPageByOfflineIdDone(
     const OfflinePageItem* result) {
   DCHECK(result);
-  online_url_ = result->url;
-  offline_url_ = result->GetOfflineURL();
+  offline_page_item_.reset(new OfflinePageItem(*result));
 }
 
 TEST_F(OfflinePageTabHelperTest, SwitchToOnlineFromOfflineOnNetwork) {
   SimulateHasNetworkConnectivity(true);
 
   StartLoad(offline_url());
   // Gives a chance to run delayed task to do redirection.
   RunUntilIdle();
   // Redirection will be done immediately on navigation start.
   EXPECT_EQ(online_url(), controller().GetPendingEntry()->GetURL());
   histograms().ExpectTotalCount(kBadNetworkHistogram, 0);
   histograms().ExpectTotalCount(kRedirectToOfflineHistogram, 0);
   histograms().ExpectTotalCount(kRedirectToOnlineHistogram, 1);
 }
 
 TEST_F(OfflinePageTabHelperTest, SwitchToOfflineFromOnlineOnNoNetwork) {
   SimulateHasNetworkConnectivity(false);
 
   StartLoad(online_url());
   // Gives a chance to run delayed task to do redirection.
   RunUntilIdle();
   // Redirection will be done immediately on navigation start.
   EXPECT_EQ(offline_url(), controller().GetPendingEntry()->GetURL());
   histograms().ExpectTotalCount(kBadNetworkHistogram, 0);
   histograms().ExpectTotalCount(kRedirectToOfflineHistogram, 1);
   histograms().ExpectTotalCount(kRedirectToOnlineHistogram, 0);
 }
 
+TEST_F(OfflinePageTabHelperTest, TestCurrentOfflinePage) {
+  SimulateHasNetworkConnectivity(false);
+
+  StartLoad(online_url());
+  // Gives a chance to run delayed task to do redirection.
+  RunUntilIdle();
+
+  const OfflinePageItem* item =
+      OfflinePageUtils::GetOfflinePageFromWebContents(web_contents());
+  EXPECT_EQ(offline_url(), item->GetOfflineURL());
+  EXPECT_EQ(online_url(), item->url);
+
+  SimulateHasNetworkConnectivity(true);
+  StartLoad(offline_url());
+  RunUntilIdle();
+  item = OfflinePageUtils::GetOfflinePageFromWebContents(web_contents());
+  EXPECT_EQ(nullptr, item);
+}
+
 TEST_F(OfflinePageTabHelperTest, SwitchToOfflineFromOnlineOnError) {
   SimulateHasNetworkConnectivity(true);
 
   StartLoad(online_url());
   RunUntilIdle();
   EXPECT_EQ(online_url(), controller().GetPendingEntry()->GetURL());
 
   // Redirection will be done immediately on navigation end with error.
   FailLoad(online_url());
   EXPECT_EQ(offline_url(), controller().GetPendingEntry()->GetURL());
@@ skipping 22 matching lines @@
 
   // Redirection should be cancelled so we should still navigate to
   // |unsaved_url|.
   EXPECT_EQ(unsaved_url, controller().GetPendingEntry()->GetURL());
 
   histograms().ExpectTotalCount(kBadNetworkHistogram, 0);
   histograms().ExpectTotalCount(kRedirectToOfflineHistogram, 0);
   histograms().ExpectTotalCount(kRedirectToOnlineHistogram, 0);
 }
 }  // namespace offline_pages