Move Google Cache copy suggestion to an action button in the neterror interstitial

chrome/common/localized_error.cc

 // Copyright (c) 2012 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/common/localized_error.h"
 
 #include "base/command_line.h"
 #include "base/i18n/rtl.h"
 #include "base/logging.h"
+#include "base/metrics/field_trial.h"
 #include "base/strings/string16.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/grit/chromium_strings.h"
 #include "chrome/grit/generated_resources.h"
 #include "components/error_page/common/error_page_params.h"
 #include "components/error_page/common/net_error_info.h"
@@ skipping 29 matching lines @@
 static const char kRedirectLoopLearnMoreUrl[] =
     "https://www.google.com/support/chrome/bin/answer.py?answer=95626";
 static const char kWeakDHKeyLearnMoreUrl[] =
     "http://sites.google.com/a/chromium.org/dev/"
     "err_ssl_weak_server_ephemeral_dh_key";
 #if defined(OS_CHROMEOS)
 static const char kAppWarningLearnMoreUrl[] =
     "chrome-extension://honijodknafkokifofgiaalefdiedpko/main.html"
     "?answer=1721911";
 #endif  // defined(OS_CHROMEOS)
+static const char kCachedCopyButtonFieldTrial[] =
+    "enable_google_cached_copy_text_experiment";
+static const char kCachedCopyButtonExpTypeControl[] = "control";
+static const char kCachedCopyButtonExpTypeCopy[] = "copy";
+static const char kCachedCopyButtonExpTypePage[] = "page";
 
 enum NAV_SUGGESTIONS {
   SUGGEST_NONE                  = 0,
   SUGGEST_RELOAD                = 1 << 0,
   SUGGEST_CHECK_CONNECTION      = 1 << 1,
   SUGGEST_DNS_CONFIG            = 1 << 2,
   SUGGEST_FIREWALL_CONFIG       = 1 << 3,
   SUGGEST_PROXY_CONFIG          = 1 << 4,
   SUGGEST_DISABLE_EXTENSION     = 1 << 5,
   SUGGEST_LEARNMORE             = 1 << 6,
@@ skipping 593 matching lines @@
   if (!params) {
     params.reset(new error_page::ErrorPageParams());
     params->suggest_reload = !!(options.suggestions & SUGGEST_RELOAD);
   }
 
   base::ListValue* suggestions = NULL;
   bool use_default_suggestions = true;
   if (!params->override_suggestions) {
     suggestions = new base::ListValue();
   } else {
     suggestions = params->override_suggestions.release();

[sky, 2015/05/13 15:52:03]

How about moving this block to it's own function?

[edwardjung, 2015/05/13 17:34:34]

Done.

     use_default_suggestions = false;
+
+    std::string fieldTrialExpType =

[sky, 2015/05/13 15:52:03]

field_trial_exp_type.

[edwardjung, 2015/05/13 17:34:34]

Done.

+        base::FieldTrialList::FindFullName(kCachedCopyButtonFieldTrial);
+
+    // If the first suggestion is for a Google cache copy. Promote the
+    // suggestion to a separate set of strings for displaying as a button.
+    if (!suggestions->empty() && !fieldTrialExpType.empty() &&
+        fieldTrialExpType != kCachedCopyButtonExpTypeControl) {
+      base::DictionaryValue* suggestion;
+      suggestions->GetDictionary(0, &suggestion);

[sky, 2015/05/13 15:52:03]

Don't you need to check the return value here?

[edwardjung, 2015/05/13 17:34:34]

Yes, I do via DictionaryValue suggestion.

+      int type = -1;
+      suggestion->GetInteger("type", &type);
+
+      if (type == 0) {
+        base::string16 cache_url;
+        suggestion->GetString("urlCorrection", &cache_url);
+        int cache_tracking_id = -1;
+        suggestion->GetInteger("trackingId", &cache_tracking_id);
+
+        base::DictionaryValue* cache_button = new base::DictionaryValue;

[sky, 2015/05/13 15:52:03]

used scoped_ptr and release when passing to Set below.

[edwardjung, 2015/05/13 17:34:34]

Done.

+
+        if (fieldTrialExpType == kCachedCopyButtonExpTypeCopy) {
+          cache_button->SetString("msg",
+                                  l10n_util::GetStringUTF16(
+                                      IDS_ERRORPAGES_BUTTON_SHOW_CACHED_COPY));
+        } else {
+          // Default to "Show cached page" button label.
+          cache_button->SetString("msg",
+                                  l10n_util::GetStringUTF16(
+                                      IDS_ERRORPAGES_BUTTON_SHOW_CACHED_PAGE));
+        }
+        cache_button->SetString("cacheUrl", cache_url);
+        cache_button->SetInteger("trackingId", cache_tracking_id);
+        error_strings->Set("cacheButton", cache_button);
+        suggestions->Remove(0, NULL);
+      }
+    }
   }
 
   error_strings->Set("suggestions", suggestions);
 
   if (params->search_url.is_valid()) {
     error_strings->SetString("searchHeader",
         l10n_util::GetStringUTF16(IDS_ERRORPAGES_SUGGESTION_GOOGLE_SEARCH));
     error_strings->SetString("searchUrl", params->search_url.spec());
     error_strings->SetString("searchTerms", params->search_terms);
     error_strings->SetInteger("searchTrackingId", params->search_tracking_id);
@@ skipping 236 matching lines @@
   GURL learn_more_url(kAppWarningLearnMoreUrl);
   base::DictionaryValue* suggest_learn_more = new base::DictionaryValue();
   suggest_learn_more->SetString("msg",
                                 l10n_util::GetStringUTF16(
                                     IDS_ERRORPAGES_SUGGESTION_LEARNMORE_BODY));
   suggest_learn_more->SetString("learnMoreUrl", learn_more_url.spec());
   error_strings->Set("suggestionsLearnMore", suggest_learn_more);
 #endif  // defined(OS_CHROMEOS)
 }
 #endif