Refactor SafeBrowsing and SSL interstitials to have a type variable

We'll be adding a new type of interstitial for captive portals. This
patch is to accomodate that change.

BUG=384667

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

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

chrome/browser/resources/security_warnings/interstitial_v2.js

@@ -26,7 +26,7 @@ function handleKeypress(e) {
   if (BYPASS_SEQUENCE.charCodeAt(keyPressState) == e.keyCode) {
     keyPressState++;
     if (keyPressState == BYPASS_SEQUENCE.length) {
-      sendCommand(CMD_PROCEED);
+      sendCommand(SSL_CMD_PROCEED);
       keyPressState = 0;
     }
   } else {
@@ -65,7 +65,7 @@ function toggleDebuggingInfo() {
 
 function setupEvents() {
   var overridable = loadTimeData.getBoolean('overridable');
-  var ssl = loadTimeData.getBoolean('ssl');
+  var ssl = loadTimeData.getString('type') === 'SSL';
 
   if (ssl) {
     $('body').classList.add('ssl');
@@ -79,14 +79,14 @@ function setupEvents() {
     if (!ssl)
       sendCommand(SB_CMD_TAKE_ME_BACK);
     else if (overridable)
-      sendCommand(CMD_DONT_PROCEED);
+      sendCommand(SSL_CMD_DONT_PROCEED);
     else
-      sendCommand(CMD_RELOAD);
+      sendCommand(SSL_CMD_RELOAD);
   });
 
   if (overridable) {
     $('proceed-link').addEventListener('click', function(event) {
-      sendCommand(ssl ? CMD_PROCEED : SB_CMD_PROCEED);
+      sendCommand(ssl ? SSL_CMD_PROCEED : SB_CMD_PROCEED);
     });
   } else if (!ssl) {
     $('final-paragraph').classList.add('hidden');
@@ -98,7 +98,7 @@ function setupEvents() {
     // Overridable SSL page doesn't have this link.
     $('help-link').addEventListener('click', function(event) {
       if (ssl)
-        sendCommand(CMD_HELP);
+        sendCommand(SSL_CMD_HELP);
       else if (loadTimeData.getBoolean('phishing'))
         sendCommand(SB_CMD_LEARN_MORE_2);
       else
@@ -108,7 +108,7 @@ function setupEvents() {
 
   if (ssl && $('clock-link')) {
     $('clock-link').addEventListener('click', function(event) {
-      sendCommand(CMD_CLOCK);
+      sendCommand(SSL_CMD_CLOCK);
     });
   }
 
@@ -119,7 +119,7 @@ function setupEvents() {
         loadTimeData.getString('closeDetails');
     if (!expandedDetails) {
       // Record a histogram entry only the first time that details is opened.
-      sendCommand(ssl ? CMD_MORE : SB_CMD_EXPANDED_SEE_MORE);
+      sendCommand(ssl ? SSL_CMD_MORE : SB_CMD_EXPANDED_SEE_MORE);
       expandedDetails = true;
     }
   });

chrome/browser/resources/security_warnings/safe_browsing.js

@@ -18,7 +18,8 @@ var SB_DISPLAY_CHECK_BOX = 'displaycheckbox';
 
 // This sets up the Extended Safe Browsing Reporting opt-in.
 function setupCheckbox() {
-  if (loadTimeData.getBoolean('ssl') || loadTimeData.getBoolean('phishing') ||
+  if (loadTimeData.getString('type') != 'SAFEBROWSING' ||
+      loadTimeData.getBoolean('phishing') ||
       !loadTimeData.getBoolean(SB_DISPLAY_CHECK_BOX)) {
     return;
   }

chrome/browser/resources/security_warnings/ssl.js

@@ -3,12 +3,12 @@
 // found in the LICENSE file.
 
 // Should match SSLBlockingPageCommands in ssl_blocking_page.cc.
-var CMD_DONT_PROCEED = 0;
-var CMD_PROCEED = 1;
-var CMD_MORE = 2;
-var CMD_RELOAD = 3;
-var CMD_HELP = 4;
-var CMD_CLOCK = 5;
+var SSL_CMD_DONT_PROCEED = 0;
+var SSL_CMD_PROCEED = 1;
+var SSL_CMD_MORE = 2;
+var SSL_CMD_RELOAD = 3;
+var SSL_CMD_HELP = 4;
+var SSL_CMD_CLOCK = 5;
 
 function setupSSLDebuggingInfo() {
   if (!loadTimeData.getBoolean('ssl'))

chrome/browser/safe_browsing/safe_browsing_blocking_page.cc

@@ -689,7 +689,7 @@ std::string SafeBrowsingBlockingPage::GetHTMLContents() {
   // Fill in the shared values.
   base::DictionaryValue load_time_data;
   webui::SetFontAndTextDirection(&load_time_data);
-  load_time_data.SetBoolean("ssl", false);
+  load_time_data.SetString("type", "SAFEBROWSING");
   load_time_data.SetString(
       "tabTitle", l10n_util::GetStringUTF16(IDS_SAFEBROWSING_V3_TITLE));
   load_time_data.SetString(

chrome/browser/ssl/ssl_blocking_page.cc

@@ -419,7 +419,7 @@ std::string SSLBlockingPage::GetHTMLContents() {
   webui::SetFontAndTextDirection(&load_time_data);
 
   // Shared values for both the overridable and non-overridable versions.
-  load_time_data.SetBoolean("ssl", true);
+  load_time_data.SetString("type", "SSL");
   load_time_data.SetBoolean("overridable", overridable_);
   load_time_data.SetString(
       "tabTitle", l10n_util::GetStringUTF16(IDS_SSL_V2_TITLE));