Make commands consistent across security interstitials

chrome/browser/resources/security_warnings/interstitial_v2.js

 // Copyright 2014 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.
 
 // This is the shared code for the new (Chrome 37) security interstitials. It is
 // used for both SSL interstitials and Safe Browsing interstitials.
 
 var expandedDetails = false;
 var keyPressState = 0;
 
+// Should match SecurityInterstitialCommands in security_interstitial_page.h
+var CMD_DONT_PROCEED = 0;
+var CMD_PROCEED = 1;
+// Ways for user to get more information
+var CMD_SHOW_MORE_SECTION = 2;
+var CMD_OPEN_HELP_CENTER = 3;
+var CMD_OPEN_DIAGNOSTIC = 4;
+// Primary button actions
+var CMD_RELOAD = 5;
+var CMD_OPEN_DATE_SETTINGS = 6;
+var CMD_OPEN_LOGIN = 7;
+// Safe Browsing Extended Reporting
+var CMD_DO_REPORT = 8;
+var CMD_DONT_REPORT = 9;
+var CMD_OPEN_REPORTING_PRIVACY = 10;
+
 /**
  * A convenience method for sending commands to the parent page.
  * @param {string} cmd  The command to send.
  */
 function sendCommand(cmd) {
   window.domAutomationController.setAutomationId(1);
   window.domAutomationController.send(cmd);
 }
 
 /**
  * This allows errors to be skippped by typing "danger" into the page.
  * @param {string} e The key that was just pressed.
  */
 function handleKeypress(e) {
   var BYPASS_SEQUENCE = 'danger';
   if (BYPASS_SEQUENCE.charCodeAt(keyPressState) == e.keyCode) {
     keyPressState++;
     if (keyPressState == BYPASS_SEQUENCE.length) {
-      sendCommand(SSL_CMD_PROCEED);
+      sendCommand(CMD_PROCEED);
       keyPressState = 0;
     }
   } else {
     keyPressState = 0;
   }
 }
 
 /**
  * This appends a piece of debugging information to the end of the warning.
  * When complete, the caller must also make the debugging div
@@ skipping 41 matching lines @@
   } else {
     $('body').classList.add('safe-browsing');
   }
 
   if (hidePrimaryButton) {
     $('primary-button').classList.add('hidden');
   } else {
     $('primary-button').addEventListener('click', function() {
       switch (interstitialType) {
         case 'CAPTIVE_PORTAL':
-          sendCommand(CAPTIVEPORTAL_CMD_OPEN_LOGIN_PAGE);
+          sendCommand(CMD_OPEN_LOGIN);
           break;
 
         case 'SSL':
           if (badClock)
-            sendCommand(SSL_CMD_CLOCK);
+            sendCommand(CMD_OPEN_DATE_SETTINGS);
           else if (overridable)
-            sendCommand(SSL_CMD_DONT_PROCEED);
+            sendCommand(CMD_DONT_PROCEED);
           else
-            sendCommand(SSL_CMD_RELOAD);
+            sendCommand(CMD_RELOAD);
           break;
 
         case 'SAFEBROWSING':
-          sendCommand(SB_CMD_TAKE_ME_BACK);
+          sendCommand(CMD_DONT_PROCEED);
           break;
 
         default:
           throw 'Invalid interstitial type';
       }
     });
   }
 
   if (overridable) {
     // Captive portal page isn't overridable.
     $('proceed-link').addEventListener('click', function(event) {
-      sendCommand(ssl ? SSL_CMD_PROCEED : SB_CMD_PROCEED);
+      sendCommand(CMD_PROCEED);
     });
   } else if (!ssl) {
     $('final-paragraph').classList.add('hidden');
   }
 
   if (ssl && overridable) {
     $('proceed-link').classList.add('small-link');
   } else if ($('help-link')) {
     // Overridable SSL page doesn't have this link.
     $('help-link').addEventListener('click', function(event) {
-      if (ssl)
-        sendCommand(SSL_CMD_HELP);
-      else if (loadTimeData.getBoolean('phishing'))
-        sendCommand(SB_CMD_LEARN_MORE_2);
+      if (ssl || loadTimeData.getBoolean('phishing'))
+        sendCommand(CMD_OPEN_HELP_CENTER);
       else
-        sendCommand(SB_CMD_SHOW_DIAGNOSTIC);
+        sendCommand(CMD_OPEN_DIAGNOSTIC);
     });
   }
 
   if (captivePortal) {
     // Captive portal page doesn't have details button.
     $('details-button').classList.add('hidden');
   } else {
     $('details-button').addEventListener('click', function(event) {
       var hiddenDetails = $('details').classList.toggle('hidden');
 
       if (mobileNav) {
         // Details appear over the main content on small screens.
         $('main-content').classList.toggle('hidden', !hiddenDetails);
       } else {
         $('main-content').classList.remove('hidden');
       }
 
       $('details-button').innerText = hiddenDetails ?
           loadTimeData.getString('openDetails') :
           loadTimeData.getString('closeDetails');
       if (!expandedDetails) {
         // Record a histogram entry only the first time that details is opened.
-        sendCommand(ssl ? SSL_CMD_MORE : SB_CMD_EXPANDED_SEE_MORE);
+        sendCommand(CMD_SHOW_MORE_SECTION);
         expandedDetails = true;
       }
     });
   }
 
   preventDefaultOnPoundLinkClicks();
   setupCheckbox();
   setupSSLDebuggingInfo();
   document.addEventListener('keypress', handleKeypress);
 }
 
 document.addEventListener('DOMContentLoaded', setupEvents);