SafeBrowsing: allow WebView to customize the Help Center URL

components/security_interstitials/core/base_safe_browsing_error_ui.h

Index: components/security_interstitials/core/base_safe_browsing_error_ui.h
diff --git a/components/security_interstitials/core/base_safe_browsing_error_ui.h b/components/security_interstitials/core/base_safe_browsing_error_ui.h
index 02d251744d30a2e818f75f1191a0ac159a0068f1..f5435ed7b2105c4ee39e9e0e22089c57136054b6 100644
--- a/components/security_interstitials/core/base_safe_browsing_error_ui.h
+++ b/components/security_interstitials/core/base_safe_browsing_error_ui.h
@@ -32,7 +32,8 @@ class BaseSafeBrowsingErrorUI {
                           bool is_extended_reporting_enabled,
                           bool is_scout_reporting_enabled,
                           bool is_proceed_anyway_disabled,
-                          bool is_resource_cancellable)
+                          bool is_resource_cancellable,
+                          const char* plink)

[Jialiu Lin, 2017/05/17 15:47:46]

nit: prefer const std::string&  over const char*

[Nate Fischer, 2017/05/17 22:34:43]

Done

         : is_main_frame_load_blocked(is_main_frame_load_blocked),
           is_extended_reporting_opt_in_allowed(
               is_extended_reporting_opt_in_allowed),
@@ -40,7 +41,8 @@ class BaseSafeBrowsingErrorUI {
           is_extended_reporting_enabled(is_extended_reporting_enabled),
           is_scout_reporting_enabled(is_scout_reporting_enabled),
           is_proceed_anyway_disabled(is_proceed_anyway_disabled),
-          is_resource_cancellable(is_resource_cancellable) {}
+          is_resource_cancellable(is_resource_cancellable),
+          plink(plink) {}
 
     // Indicates if this SB interstitial is blocking main frame load.
     bool is_main_frame_load_blocked;
@@ -63,6 +65,10 @@ class BaseSafeBrowsingErrorUI {
     // Indicates if "back to safety" should cancel the pending navigation or
     // navigate back after it's committed.
     bool is_resource_cancellable;
+
+    // The p= query parameter used when visiting the Help Center. If this is
+    // nullptr, then a default value will be used for the SafeBrowsing article.
+    const char* plink;

[Jialiu Lin, 2017/05/17 15:47:46]

nit: plink is a very general name, unless you want to reuse it for other
purpose, how about just called help_center_article_link?  And prefer const
std::string over char*.

[Nate Fischer, 2017/05/17 22:34:43]

Done

   };
 
   BaseSafeBrowsingErrorUI(
@@ -105,6 +111,8 @@ class BaseSafeBrowsingErrorUI {
     return display_options_.is_resource_cancellable;
   }
 
+  const char* get_plink() const { return display_options_.plink; }
+
   // Checks if we should even show the extended reporting option. We don't show
   // it in incognito mode or if kSafeBrowsingExtendedReportingOptInAllowed
   // preference is disabled.