Alter Google cached copy button experiment, remove label variations

- Switch button label to 'Show saved copy' per launch review.
- Experiment will focus on promoting the link doctor link to a button.

BUG=474848

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

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

4 files changed, 5 insertions, 18 deletions

diff --git a/components/error_page/common/net_error_info.h b/components/error_page/common/net_error_info.h
index de0e8ec..77d6a28 100644
--- a/components/error_page/common/net_error_info.h
+++ b/components/error_page/common/net_error_info.h
@@ -32,11 +32,12 @@ enum NetworkErrorPageEvent {
 
   NETWORK_ERROR_EASTER_EGG_ACTIVATED = 12,         // Easter egg activated.
 
-  // For "Google cached copy" label experiment button.
+  // For "Google cached copy" button experiment.
   NETWORK_ERROR_PAGE_CACHED_COPY_BUTTON_SHOWN = 13,
   NETWORK_ERROR_PAGE_CACHED_COPY_BUTTON_CLICKED = 14,
-  NETWORK_ERROR_PAGE_CACHED_PAGE_BUTTON_SHOWN = 15,
-  NETWORK_ERROR_PAGE_CACHED_PAGE_BUTTON_CLICKED = 16,
+  // Obsolete. No longer experimenting with the label.
+  // NETWORK_ERROR_PAGE_CACHED_PAGE_BUTTON_SHOWN = 15,
+  // NETWORK_ERROR_PAGE_CACHED_PAGE_BUTTON_CLICKED = 16,
 
   NETWORK_ERROR_DIAGNOSE_BUTTON_CLICKED = 17,      // Diagnose 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 c9d42d5..60e2eeaf 100644
--- a/components/error_page/renderer/net_error_helper_core.cc
+++ b/components/error_page/renderer/net_error_helper_core.cc
@@ -376,7 +376,6 @@ struct NetErrorHelperCore::ErrorPageInfo {
         needs_load_navigation_corrections(false),
         reload_button_in_page(false),
         show_saved_copy_button_in_page(false),
-        show_cached_page_button_in_page(false),
         show_cached_copy_button_in_page(false),
         is_finished_loading(false),
         auto_reload_triggered(false) {
@@ -411,7 +410,6 @@ struct NetErrorHelperCore::ErrorPageInfo {
   // Track if specific buttons are included in an error page, for statistics.
   bool reload_button_in_page;
   bool show_saved_copy_button_in_page;
-  bool show_cached_page_button_in_page;
   bool show_cached_copy_button_in_page;
 
   // True if a page has completed loading, at which point it can receive
@@ -598,8 +596,6 @@ void NetErrorHelperCore::OnFinishLoad(FrameType frame_type) {
   }
   if (committed_error_page_info_->show_cached_copy_button_in_page) {
     RecordEvent(NETWORK_ERROR_PAGE_CACHED_COPY_BUTTON_SHOWN);
-  } else if (committed_error_page_info_->show_cached_page_button_in_page) {
-    RecordEvent(NETWORK_ERROR_PAGE_CACHED_PAGE_BUTTON_SHOWN);
   }
 
   delegate_->EnablePageHelperFunctions();
@@ -647,14 +643,13 @@ void NetErrorHelperCore::GetErrorHTML(
     bool reload_button_in_page;
     bool show_saved_copy_button_in_page;
     bool show_cached_copy_button_in_page;
-    bool show_cached_page_button_in_page;
 
     delegate_->GenerateLocalizedErrorPage(
         error, is_failed_post,
         false /* No diagnostics dialogs allowed for subframes. */,
         scoped_ptr<ErrorPageParams>(), &reload_button_in_page,
         &show_saved_copy_button_in_page, &show_cached_copy_button_in_page,
-        &show_cached_page_button_in_page, error_html);
+        error_html);
   }
 }
 
@@ -721,7 +716,6 @@ void NetErrorHelperCore::GetErrorHtmlForMainFrame(
       &pending_error_page_info->reload_button_in_page,
       &pending_error_page_info->show_saved_copy_button_in_page,
       &pending_error_page_info->show_cached_copy_button_in_page,
-      &pending_error_page_info->show_cached_page_button_in_page,
       error_html);
 }
 
@@ -786,7 +780,6 @@ void NetErrorHelperCore::OnNavigationCorrectionsFetched(
         &pending_error_page_info_->reload_button_in_page,
         &pending_error_page_info_->show_saved_copy_button_in_page,
         &pending_error_page_info_->show_cached_copy_button_in_page,
-        &pending_error_page_info_->show_cached_page_button_in_page,
         &error_html);
   } else {
     // Since |navigation_correction_params| in |pending_error_page_info_| is
@@ -947,9 +940,6 @@ void NetErrorHelperCore::ExecuteButtonPress(Button button) {
     case SHOW_CACHED_COPY_BUTTON:
       RecordEvent(NETWORK_ERROR_PAGE_CACHED_COPY_BUTTON_CLICKED);
       return;
-    case SHOW_CACHED_PAGE_BUTTON:
-      RecordEvent(NETWORK_ERROR_PAGE_CACHED_PAGE_BUTTON_CLICKED);
-      return;
     case DIAGNOSE_ERROR:
       RecordEvent(NETWORK_ERROR_DIAGNOSE_BUTTON_CLICKED);
       delegate_->DiagnoseError(
diff --git a/components/error_page/renderer/net_error_helper_core.h b/components/error_page/renderer/net_error_helper_core.h
index a46b93b..be88ccc 100644
--- a/components/error_page/renderer/net_error_helper_core.h
+++ b/components/error_page/renderer/net_error_helper_core.h
@@ -49,7 +49,6 @@ class NetErrorHelperCore {
     MORE_BUTTON,
     EASTER_EGG,
     SHOW_CACHED_COPY_BUTTON,  // "Google cached copy" button label experiment.
-    SHOW_CACHED_PAGE_BUTTON,  // "Google cached page" button label experiment.
     DIAGNOSE_ERROR,
   };
 
@@ -66,7 +65,6 @@ class NetErrorHelperCore {
         bool* reload_button_shown,
         bool* show_saved_copy_button_shown,
         bool* show_cached_copy_button_shown,
-        bool* show_cached_page_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 5b87960..2081d0d 100644
--- a/components/error_page/renderer/net_error_helper_core_unittest.cc
+++ b/components/error_page/renderer/net_error_helper_core_unittest.cc
@@ -322,7 +322,6 @@ class NetErrorHelperCoreTest : public testing::Test,
                                   bool* reload_button_shown,
                                   bool* show_saved_copy_button_shown,
                                   bool* show_cached_copy_button_shown,
-                                  bool* show_cached_page_button_shown,
                                   std::string* html) const override {
     last_can_show_network_diagnostics_dialog_ =
         can_show_network_diagnostics_dialog;
@@ -330,7 +329,6 @@ class NetErrorHelperCoreTest : public testing::Test,
     *reload_button_shown = false;
     *show_saved_copy_button_shown = false;
     *show_cached_copy_button_shown = false;
-    *show_cached_page_button_shown = false;
     *html = ErrorToString(error, is_failed_post);
   }