Add "SHOW ALL SAVED PAGES" button to offline error page

components/error_page/renderer/net_error_helper_core_unittest.cc

Index: components/error_page/renderer/net_error_helper_core_unittest.cc
diff --git a/components/error_page/renderer/net_error_helper_core_unittest.cc b/components/error_page/renderer/net_error_helper_core_unittest.cc
index 35bf6d47c0979b3e876ef6027a494fab2f79b7cc..fbd6b27dbde80843eb0b6dba5d07f45387bee00d 100644
--- a/components/error_page/renderer/net_error_helper_core_unittest.cc
+++ b/components/error_page/renderer/net_error_helper_core_unittest.cc
@@ -158,8 +158,9 @@ class NetErrorHelperCoreTest : public testing::Test,
         error_html_update_count_(0),
         reload_count_(0),
         reload_bypassing_cache_count_(0),
-        show_saved_count_(0),
+        show_saved_copy_count_(0),
         diagnose_error_count_(0),
+        show_saved_pages_count_(0),
         enable_page_helper_functions_count_(0),
         default_url_(GURL(kFailedUrl)),
         error_url_(GURL(content::kUnreachableWebDataURL)),
@@ -201,12 +202,12 @@ class NetErrorHelperCoreTest : public testing::Test,
     return reload_bypassing_cache_count_;
   }
 
-  int show_saved_count() const {
-    return show_saved_count_;
+  int show_saved_copy_count() const {
+    return show_saved_copy_count_;
   }
 
-  const GURL& show_saved_url() const {
-    return show_saved_url_;
+  const GURL& show_saved_copy_url() const {
+    return show_saved_copy_url_;
   }
 
   int diagnose_error_count() const {
@@ -217,6 +218,10 @@ class NetErrorHelperCoreTest : public testing::Test,
     return diagnose_error_url_;
   }
 
+  int show_saved_pages_count() const {
+    return show_saved_pages_count_;
+  }
+
   const GURL& default_url() const {
     return default_url_;
   }
@@ -239,6 +244,10 @@ class NetErrorHelperCoreTest : public testing::Test,
     return last_can_show_network_diagnostics_dialog_;
   }
 
+  bool last_has_offline_pages() const {
+    return last_has_offline_pages_;
+  }
+
   const ErrorPageParams* last_error_page_params() const {
     return last_error_page_params_.get();
   }
@@ -344,17 +353,21 @@ class NetErrorHelperCoreTest : public testing::Test,
   void GenerateLocalizedErrorPage(const WebURLError& error,
                                   bool is_failed_post,
                                   bool can_show_network_diagnostics_dialog,
+                                  bool has_offline_pages,
                                   scoped_ptr<ErrorPageParams> params,
                                   bool* reload_button_shown,
                                   bool* show_saved_copy_button_shown,
                                   bool* show_cached_copy_button_shown,
+                                  bool* show_saved_pages_button_shown,
                                   std::string* html) const override {
     last_can_show_network_diagnostics_dialog_ =
         can_show_network_diagnostics_dialog;
+    last_has_offline_pages_ = has_offline_pages;
     last_error_page_params_.reset(params.release());
     *reload_button_shown = false;
     *show_saved_copy_button_shown = false;
     *show_cached_copy_button_shown = false;
+    *show_saved_pages_button_shown = false;
     *html = ErrorToString(error, is_failed_post);
   }
 
@@ -368,10 +381,12 @@ class NetErrorHelperCoreTest : public testing::Test,
   }
 
   void UpdateErrorPage(const WebURLError& error, bool is_failed_post,
-                       bool can_show_network_diagnostics_dialog) override {
+                       bool can_show_network_diagnostics_dialog,
+                       bool has_offline_pages) override {
     update_count_++;
     last_can_show_network_diagnostics_dialog_ =
         can_show_network_diagnostics_dialog;
+    last_has_offline_pages_ = has_offline_pages;
     last_error_page_params_.reset(nullptr);
     last_error_html_ = ErrorToString(error, is_failed_post);
   }
@@ -413,8 +428,8 @@ class NetErrorHelperCoreTest : public testing::Test,
   }
 
   void LoadPageFromCache(const GURL& page_url) override {
-    show_saved_count_++;
-    show_saved_url_ = page_url;
+    show_saved_copy_count_++;
+    show_saved_copy_url_ = page_url;
   }
 
   void DiagnoseError(const GURL& page_url) override {
@@ -422,6 +437,10 @@ class NetErrorHelperCoreTest : public testing::Test,
     diagnose_error_url_ = page_url;
   }
 
+  void ShowOfflinePages() override {
+    show_saved_pages_count_++;
+  }
+
   void SendTrackingRequest(const GURL& tracking_url,
                            const std::string& tracking_request_body) override {
     last_tracking_url_ = tracking_url;
@@ -464,15 +483,16 @@ class NetErrorHelperCoreTest : public testing::Test,
   // Values passed in to the last call of GenerateLocalizedErrorPage or
   // UpdateErrorPage.  Mutable because GenerateLocalizedErrorPage is const.
   mutable bool last_can_show_network_diagnostics_dialog_;
+  mutable bool last_has_offline_pages_;
   mutable scoped_ptr<ErrorPageParams> last_error_page_params_;
 
   int reload_count_;
   int reload_bypassing_cache_count_;
-  int show_saved_count_;
-  GURL show_saved_url_;
+  int show_saved_copy_count_;
+  GURL show_saved_copy_url_;
   int diagnose_error_count_;
   GURL diagnose_error_url_;
-
+  int show_saved_pages_count_;
 
   int enable_page_helper_functions_count_;
 
@@ -2532,10 +2552,10 @@ TEST_F(NetErrorHelperCoreTest, ExplicitReloadDoNotBypassCache) {
 
 TEST_F(NetErrorHelperCoreTest, ExplicitShowSavedSucceeds) {
   DoErrorLoad(net::ERR_CONNECTION_RESET);
-  EXPECT_EQ(0, show_saved_count());
+  EXPECT_EQ(0, show_saved_copy_count());
   core()->ExecuteButtonPress(NetErrorHelperCore::SHOW_SAVED_COPY_BUTTON);
-  EXPECT_EQ(1, show_saved_count());
-  EXPECT_EQ(GURL(kFailedUrl), show_saved_url());
+  EXPECT_EQ(1, show_saved_copy_count());
+  EXPECT_EQ(GURL(kFailedUrl), show_saved_copy_url());
 }
 
 TEST_F(NetErrorHelperCoreTest, CanNotShowNetworkDiagnostics) {
@@ -2554,5 +2574,14 @@ TEST_F(NetErrorHelperCoreTest, CanShowNetworkDiagnostics) {
   EXPECT_EQ(GURL(kFailedUrl), diagnose_error_url());
 }
 
+TEST_F(NetErrorHelperCoreTest, ShowSavedPages) {
+  core()->OnSetHasOfflinePages(true);
+  DoErrorLoad(net::ERR_INTERNET_DISCONNECTED);
+  EXPECT_TRUE(last_has_offline_pages());
+  EXPECT_EQ(0, show_saved_pages_count());
+  core()->ExecuteButtonPress(NetErrorHelperCore::SHOW_SAVED_PAGES_BUTTON);
+  EXPECT_EQ(1, show_saved_pages_count());
+}
+
 }  // namespace
 }  // namespace error_page