Refactor SafeBrowsing and SSL interstitials to have a type variable

chrome/browser/safe_browsing/safe_browsing_blocking_page.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.
 //
 // Implementation of the SafeBrowsingBlockingPage class.
 
 #include "chrome/browser/safe_browsing/safe_browsing_blocking_page.h"
 
 #include <string>
 
@@ skipping 671 matching lines @@
   // Otherwise, check the threat type.
   return unsafe_resources.size() == 1 && !unsafe_resources[0].is_subresource;
 }
 
 std::string SafeBrowsingBlockingPage::GetHTMLContents() {
   DCHECK(!unsafe_resources_.empty());
 
   // 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");

[mattm, 2014/09/25 21:27:26]

Lowercase s seems a little weird. Is there some style this is following, or
could it be SafeBrowsing or safe_browsing instead?

[meacer, 2014/09/25 21:46:09]

I wanted to follow the convention with other variable names below this line
(tabTitle, openDetails etc), even though this is actually the value and not the
variable name. I don't mind changing it though.

[mattm, 2014/09/25 21:49:57]

In that case, it seems more like it should follow the style of constant or maybe
enum naming rather than a variable.

[meacer, 2014/09/25 21:58:33]

Done, I assumed Safebrowsing is a single word.

   load_time_data.SetString(
       "tabTitle", l10n_util::GetStringUTF16(IDS_SAFEBROWSING_V3_TITLE));
   load_time_data.SetString(
       "openDetails",
       l10n_util::GetStringUTF16(IDS_SAFEBROWSING_V3_OPEN_DETAILS_BUTTON));
   load_time_data.SetString(
       "closeDetails",
       l10n_util::GetStringUTF16(IDS_SAFEBROWSING_V3_CLOSE_DETAILS_BUTTON));
   load_time_data.SetString(
       "primaryButtonText",
@@ skipping 108 matching lines @@
           IDS_PHISHING_V3_PRIMARY_PARAGRAPH,
           base::UTF8ToUTF16(url_.host())));
   load_time_data->SetString(
       "explanationParagraph",
       l10n_util::GetStringFUTF16(IDS_PHISHING_V3_EXPLANATION_PARAGRAPH,
                                  base::UTF8ToUTF16(url_.host())));
   load_time_data->SetString(
       "finalParagraph",
       l10n_util::GetStringUTF16(IDS_PHISHING_V3_PROCEED_PARAGRAPH));
 }