| 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 fbd6b27dbde80843eb0b6dba5d07f45387bee00d..06fdb0666588c934c55061552df6ece2bf714808 100644
|
| --- a/components/error_page/renderer/net_error_helper_core_unittest.cc
|
| +++ b/components/error_page/renderer/net_error_helper_core_unittest.cc
|
| @@ -160,7 +160,8 @@ class NetErrorHelperCoreTest : public testing::Test,
|
| reload_bypassing_cache_count_(0),
|
| show_saved_copy_count_(0),
|
| diagnose_error_count_(0),
|
| - show_saved_pages_count_(0),
|
| + show_offline_pages_count_(0),
|
| + load_offline_copy_count_(0),
|
| enable_page_helper_functions_count_(0),
|
| default_url_(GURL(kFailedUrl)),
|
| error_url_(GURL(content::kUnreachableWebDataURL)),
|
| @@ -218,8 +219,12 @@ class NetErrorHelperCoreTest : public testing::Test,
|
| return diagnose_error_url_;
|
| }
|
|
|
| - int show_saved_pages_count() const {
|
| - return show_saved_pages_count_;
|
| + int show_offline_pages_count() const {
|
| + return show_offline_pages_count_;
|
| + }
|
| +
|
| + int load_offline_copy_count() const {
|
| + return load_offline_copy_count_;
|
| }
|
|
|
| const GURL& default_url() const {
|
| @@ -244,8 +249,8 @@ class NetErrorHelperCoreTest : public testing::Test,
|
| return last_can_show_network_diagnostics_dialog_;
|
| }
|
|
|
| - bool last_has_offline_pages() const {
|
| - return last_has_offline_pages_;
|
| + int last_offline_page_status() const {
|
| + return last_offline_page_status_;
|
| }
|
|
|
| const ErrorPageParams* last_error_page_params() const {
|
| @@ -353,21 +358,23 @@ class NetErrorHelperCoreTest : public testing::Test,
|
| void GenerateLocalizedErrorPage(const WebURLError& error,
|
| bool is_failed_post,
|
| bool can_show_network_diagnostics_dialog,
|
| - bool has_offline_pages,
|
| + int offline_page_status,
|
| 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,
|
| + bool* show_offline_pages_button_shown,
|
| + bool* show_offline_copy_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_offline_page_status_ = offline_page_status;
|
| 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;
|
| + *show_offline_pages_button_shown = false;
|
| + *show_offline_copy_button_shown = false;
|
| *html = ErrorToString(error, is_failed_post);
|
| }
|
|
|
| @@ -382,11 +389,11 @@ class NetErrorHelperCoreTest : public testing::Test,
|
|
|
| void UpdateErrorPage(const WebURLError& error, bool is_failed_post,
|
| bool can_show_network_diagnostics_dialog,
|
| - bool has_offline_pages) override {
|
| + int offline_page_status) override {
|
| update_count_++;
|
| last_can_show_network_diagnostics_dialog_ =
|
| can_show_network_diagnostics_dialog;
|
| - last_has_offline_pages_ = has_offline_pages;
|
| + last_offline_page_status_ = offline_page_status;
|
| last_error_page_params_.reset(nullptr);
|
| last_error_html_ = ErrorToString(error, is_failed_post);
|
| }
|
| @@ -438,7 +445,11 @@ class NetErrorHelperCoreTest : public testing::Test,
|
| }
|
|
|
| void ShowOfflinePages() override {
|
| - show_saved_pages_count_++;
|
| + show_offline_pages_count_++;
|
| + }
|
| +
|
| + void LoadOfflineCopy(const GURL& page_url) override {
|
| + load_offline_copy_count_++;
|
| }
|
|
|
| void SendTrackingRequest(const GURL& tracking_url,
|
| @@ -483,7 +494,7 @@ 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 int last_offline_page_status_;
|
| mutable scoped_ptr<ErrorPageParams> last_error_page_params_;
|
|
|
| int reload_count_;
|
| @@ -492,7 +503,8 @@ class NetErrorHelperCoreTest : public testing::Test,
|
| GURL show_saved_copy_url_;
|
| int diagnose_error_count_;
|
| GURL diagnose_error_url_;
|
| - int show_saved_pages_count_;
|
| + int show_offline_pages_count_;
|
| + int load_offline_copy_count_;
|
|
|
| int enable_page_helper_functions_count_;
|
|
|
| @@ -2574,13 +2586,25 @@ TEST_F(NetErrorHelperCoreTest, CanShowNetworkDiagnostics) {
|
| EXPECT_EQ(GURL(kFailedUrl), diagnose_error_url());
|
| }
|
|
|
| -TEST_F(NetErrorHelperCoreTest, ShowSavedPages) {
|
| - core()->OnSetHasOfflinePages(true);
|
| +TEST_F(NetErrorHelperCoreTest, ShowOfflinePages) {
|
| + core()->OnSetOfflinePageInfo(2);
|
| + DoErrorLoad(net::ERR_INTERNET_DISCONNECTED);
|
| + EXPECT_EQ(2, last_offline_page_status());
|
| + EXPECT_EQ(0, show_offline_pages_count());
|
| + EXPECT_EQ(0, load_offline_copy_count());
|
| + core()->ExecuteButtonPress(NetErrorHelperCore::SHOW_OFFLINE_PAGES_BUTTON);
|
| + EXPECT_EQ(1, show_offline_pages_count());
|
| +}
|
| +
|
| +TEST_F(NetErrorHelperCoreTest, LoadOfflineCopy) {
|
| + core()->OnSetOfflinePageInfo(1);
|
| 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());
|
| + EXPECT_EQ(1, last_offline_page_status());
|
| + EXPECT_EQ(0, show_offline_pages_count());
|
| + EXPECT_EQ(0, load_offline_copy_count());
|
| + core()->ExecuteButtonPress(NetErrorHelperCore::SHOW_OFFLINE_COPY_BUTTON);
|
| + EXPECT_EQ(0, show_offline_pages_count());
|
| + EXPECT_EQ(1, load_offline_copy_count());
|
| }
|
|
|
| } // namespace
|
|
|