Three way experiment for "Show saved copy" button.

BUG=368049

Review URL: https://codereview.chromium.org/961443002

Cr-Commit-Position: refs/heads/master@{#320113}

4 files changed, 36 insertions, 35 deletions

diff --git a/components/error_page/common/net_error_info.h b/components/error_page/common/net_error_info.h
index 35433ff..bbb99eb 100644
--- a/components/error_page/common/net_error_info.h
+++ b/components/error_page/common/net_error_info.h
@@ -17,9 +17,10 @@ enum NetworkErrorPageEvent {
   NETWORK_ERROR_PAGE_RELOAD_BUTTON_ERROR,        // Reload button clicked
                                                  // -> error.
 
-  NETWORK_ERROR_PAGE_LOAD_STALE_BUTTON_SHOWN,    // Load stale buttons shown.
-  NETWORK_ERROR_PAGE_LOAD_STALE_BUTTON_CLICKED,  // Load stale button clicked.
-  NETWORK_ERROR_PAGE_LOAD_STALE_BUTTON_ERROR,    // Load stale buttons -> error.
+  // Same for the "Show saved copy" button.
+  NETWORK_ERROR_PAGE_SHOW_SAVED_COPY_BUTTON_SHOWN,
+  NETWORK_ERROR_PAGE_SHOW_SAVED_COPY_BUTTON_CLICKED,
+  NETWORK_ERROR_PAGE_SHOW_SAVED_COPY_BUTTON_ERROR,
 
   NETWORK_ERROR_PAGE_MORE_BUTTON_CLICKED,        // More button clicked.
 
diff --git a/components/error_page/renderer/net_error_helper_core.cc b/components/error_page/renderer/net_error_helper_core.cc
index 1cc3005..7a6cfac 100644
--- a/components/error_page/renderer/net_error_helper_core.cc
+++ b/components/error_page/renderer/net_error_helper_core.cc
@@ -377,7 +377,7 @@ struct NetErrorHelperCore::ErrorPageInfo {
         needs_dns_updates(false),
         needs_load_navigation_corrections(false),
         reload_button_in_page(false),
-        load_stale_button_in_page(false),
+        show_saved_copy_button_in_page(false),
         is_finished_loading(false),
         auto_reload_triggered(false) {
   }
@@ -410,7 +410,7 @@ struct NetErrorHelperCore::ErrorPageInfo {
 
   // Track if specific buttons are included in an error page, for statistics.
   bool reload_button_in_page;
-  bool load_stale_button_in_page;
+  bool show_saved_copy_button_in_page;
 
   // True if a page has completed loading, at which point it can receive
   // updates.
@@ -547,11 +547,11 @@ void NetErrorHelperCore::OnCommitLoad(FrameType frame_type, const GURL& url) {
       committed_error_page_info_->error.unreachableURL ==
           pending_error_page_info_->error.unreachableURL) {
     DCHECK(navigation_from_button_ == RELOAD_BUTTON ||
-           navigation_from_button_ == LOAD_STALE_BUTTON);
+           navigation_from_button_ == SHOW_SAVED_COPY_BUTTON);
     chrome_common_net::RecordEvent(
         navigation_from_button_ == RELOAD_BUTTON ?
             chrome_common_net::NETWORK_ERROR_PAGE_RELOAD_BUTTON_ERROR :
-            chrome_common_net::NETWORK_ERROR_PAGE_LOAD_STALE_BUTTON_ERROR);
+            chrome_common_net::NETWORK_ERROR_PAGE_SHOW_SAVED_COPY_BUTTON_ERROR);
   }
   navigation_from_button_ = NO_BUTTON;
 
@@ -584,9 +584,9 @@ void NetErrorHelperCore::OnFinishLoad(FrameType frame_type) {
     chrome_common_net::RecordEvent(
         chrome_common_net::NETWORK_ERROR_PAGE_RELOAD_BUTTON_SHOWN);
   }
-  if (committed_error_page_info_->load_stale_button_in_page) {
+  if (committed_error_page_info_->show_saved_copy_button_in_page) {
     chrome_common_net::RecordEvent(
-        chrome_common_net::NETWORK_ERROR_PAGE_LOAD_STALE_BUTTON_SHOWN);
+        chrome_common_net::NETWORK_ERROR_PAGE_SHOW_SAVED_COPY_BUTTON_SHOWN);
   }
 
   delegate_->EnablePageHelperFunctions();
@@ -632,11 +632,11 @@ void NetErrorHelperCore::GetErrorHTML(
   } else {
     // These values do not matter, as error pages in iframes hide the buttons.
     bool reload_button_in_page;
-    bool load_stale_button_in_page;
+    bool show_saved_copy_button_in_page;
 
     delegate_->GenerateLocalizedErrorPage(
         error, is_failed_post, scoped_ptr<ErrorPageParams>(),
-        &reload_button_in_page, &load_stale_button_in_page,
+        &reload_button_in_page, &show_saved_copy_button_in_page,
         error_html);
   }
 }
@@ -697,7 +697,7 @@ void NetErrorHelperCore::GetErrorHtmlForMainFrame(
       error, pending_error_page_info->was_failed_post,
       scoped_ptr<ErrorPageParams>(),
       &pending_error_page_info->reload_button_in_page,
-      &pending_error_page_info->load_stale_button_in_page,
+      &pending_error_page_info->show_saved_copy_button_in_page,
       error_html);
 }
 
@@ -716,7 +716,7 @@ void NetErrorHelperCore::UpdateErrorPage() {
     committed_error_page_info_->needs_dns_updates = false;
 
   // There is no need to worry about the button display statistics here because
-  // the presentation of the reload and load stale buttons can't be changed
+  // the presentation of the reload and show saved copy buttons can't be changed
   // by a DNS error update.
   delegate_->UpdateErrorPage(
       GetUpdatedError(committed_error_page_info_->error),
@@ -758,7 +758,7 @@ void NetErrorHelperCore::OnNavigationCorrectionsFetched(
         pending_error_page_info_->was_failed_post,
         params.Pass(),
         &pending_error_page_info_->reload_button_in_page,
-        &pending_error_page_info_->load_stale_button_in_page,
+        &pending_error_page_info_->show_saved_copy_button_in_page,
         &error_html);
   } else {
     // Since |navigation_correction_params| in |pending_error_page_info_| is
@@ -897,10 +897,10 @@ void NetErrorHelperCore::ExecuteButtonPress(Button button) {
       navigation_from_button_ = RELOAD_BUTTON;
       Reload();
       return;
-    case LOAD_STALE_BUTTON:
+    case SHOW_SAVED_COPY_BUTTON:
       chrome_common_net::RecordEvent(
-          chrome_common_net::NETWORK_ERROR_PAGE_LOAD_STALE_BUTTON_CLICKED);
-      navigation_from_button_ = LOAD_STALE_BUTTON;
+          chrome_common_net::NETWORK_ERROR_PAGE_SHOW_SAVED_COPY_BUTTON_CLICKED);
+      navigation_from_button_ = SHOW_SAVED_COPY_BUTTON;
       delegate_->LoadPageFromCache(
           committed_error_page_info_->error.unreachableURL);
       return;
diff --git a/components/error_page/renderer/net_error_helper_core.h b/components/error_page/renderer/net_error_helper_core.h
index 4c16e25..4d880b8 100644
--- a/components/error_page/renderer/net_error_helper_core.h
+++ b/components/error_page/renderer/net_error_helper_core.h
@@ -45,7 +45,7 @@ class NetErrorHelperCore {
   enum Button {
     NO_BUTTON,
     RELOAD_BUTTON,
-    LOAD_STALE_BUTTON,
+    SHOW_SAVED_COPY_BUTTON,
     MORE_BUTTON,
   };
 
@@ -59,7 +59,7 @@ class NetErrorHelperCore {
         bool is_failed_post,
         scoped_ptr<error_page::ErrorPageParams> params,
         bool* reload_button_shown,
-        bool* load_stale_button_shown,
+        bool* show_saved_copy_button_shown,
         std::string* html) const = 0;
 
     // Loads the given HTML in the main frame for use as an error page.
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 b6a389f..829fef9 100644
--- a/components/error_page/renderer/net_error_helper_core_unittest.cc
+++ b/components/error_page/renderer/net_error_helper_core_unittest.cc
@@ -151,7 +151,7 @@ class NetErrorHelperCoreTest : public testing::Test,
                              update_count_(0),
                              error_html_update_count_(0),
                              reload_count_(0),
-                             load_stale_count_(0),
+                             show_saved_count_(0),
                              enable_page_helper_functions_count_(0),
                              default_url_(GURL(kFailedUrl)),
                              error_url_(GURL(content::kUnreachableWebDataURL)),
@@ -188,12 +188,12 @@ class NetErrorHelperCoreTest : public testing::Test,
     return reload_count_;
   }
 
-  int load_stale_count() const {
-    return load_stale_count_;
+  int show_saved_count() const {
+    return show_saved_count_;
   }
 
-  const GURL& load_stale_url() const {
-    return load_stale_url_;
+  const GURL& show_saved_url() const {
+    return show_saved_url_;
   }
 
   const GURL& default_url() const {
@@ -298,11 +298,11 @@ class NetErrorHelperCoreTest : public testing::Test,
                                   bool is_failed_post,
                                   scoped_ptr<ErrorPageParams> params,
                                   bool* reload_button_shown,
-                                  bool* load_stale_button_shown,
+                                  bool* show_saved_copy_button_shown,
                                   std::string* html) const override {
     last_error_page_params_.reset(params.release());
     *reload_button_shown = false;
-    *load_stale_button_shown = false;
+    *show_saved_copy_button_shown = false;
     *html = ErrorToString(error, is_failed_post);
   }
 
@@ -355,8 +355,8 @@ class NetErrorHelperCoreTest : public testing::Test,
   void ReloadPage() override { reload_count_++; }
 
   void LoadPageFromCache(const GURL& error_url) override {
-    load_stale_count_++;
-    load_stale_url_ = error_url;
+    show_saved_count_++;
+    show_saved_url_ = error_url;
   }
 
   void SendTrackingRequest(const GURL& tracking_url,
@@ -402,8 +402,8 @@ class NetErrorHelperCoreTest : public testing::Test,
   mutable scoped_ptr<ErrorPageParams> last_error_page_params_;
 
   int reload_count_;
-  int load_stale_count_;
-  GURL load_stale_url_;
+  int show_saved_count_;
+  GURL show_saved_url_;
 
   int enable_page_helper_functions_count_;
 
@@ -2444,12 +2444,12 @@ TEST_F(NetErrorHelperCoreTest, ExplicitReloadSucceeds) {
   EXPECT_EQ(1, reload_count());
 }
 
-TEST_F(NetErrorHelperCoreTest, ExplicitLoadStaleSucceeds) {
+TEST_F(NetErrorHelperCoreTest, ExplicitShowSavedSucceeds) {
   DoErrorLoad(net::ERR_CONNECTION_RESET);
-  EXPECT_EQ(0, load_stale_count());
-  core()->ExecuteButtonPress(NetErrorHelperCore::LOAD_STALE_BUTTON);
-  EXPECT_EQ(1, load_stale_count());
-  EXPECT_EQ(GURL(kFailedUrl), load_stale_url());
+  EXPECT_EQ(0, show_saved_count());
+  core()->ExecuteButtonPress(NetErrorHelperCore::SHOW_SAVED_COPY_BUTTON);
+  EXPECT_EQ(1, show_saved_count());
+  EXPECT_EQ(GURL(kFailedUrl), show_saved_url());
 }
 
 }  // namespace