Add the extended reporting checkbox to the malware interstitial v3

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 1291 matching lines @@
           l10n_util::GetStringFUTF16(
               IDS_MALWARE_V3_EXPLANATION_PARAGRAPH,
               base::UTF8ToUTF16(url_.host())) :
           l10n_util::GetStringFUTF16(
               IDS_MALWARE_V3_EXPLANATION_PARAGRAPH_SUBRESOURCE,
               base::UTF8ToUTF16(web_contents_->GetURL().host()),
               base::UTF8ToUTF16(url_.host())));
   load_time_data->SetString(
       "finalParagraph",
       l10n_util::GetStringUTF16(IDS_MALWARE_V3_PROCEED_PARAGRAPH));
+
+  if (!CanShowMalwareDetailsOption()) return;

[Dan Beam, 2014/06/16 19:05:50]

nit: if () { ... } instead of if (!) return; so people are less likely to add
unrelated code below here that accidentally doesn't get run

[felt, 2014/06/17 05:41:55]

Done.

+  load_time_data->SetBoolean(kDisplayCheckBox, true);

[mattm, 2014/06/16 21:02:21]

is it okay that this is undefined instead of false when 
!CanShowMalwareDetailsOption?

[felt, 2014/06/17 05:41:55]

Done.

+  std::string privacy_link = base::StringPrintf(
+      kPrivacyLinkHtml,
+      l10n_util::GetStringUTF8(
+          IDS_SAFE_BROWSING_PRIVACY_POLICY_PAGE_V2).c_str());
+  load_time_data->SetString(
+      "optinText",
+      l10n_util::GetStringFUTF16(IDS_SAFE_BROWSING_MALWARE_V2_REPORTING_AGREE,
+                                 base::UTF8ToUTF16(privacy_link)));
+  load_time_data->SetBoolean(
+      kBoxChecked, IsPrefEnabled(prefs::kSafeBrowsingReportingEnabled));

[mattm, 2014/06/16 21:02:21]

This should do the migration stuff like 336673002?

[felt, 2014/06/17 05:41:55]

Done now that I could rebase off 336673002.

 }
 
 void SafeBrowsingBlockingPageV3::PopulatePhishingLoadTimeData(
     base::DictionaryValue* load_time_data) {
   load_time_data->SetBoolean("phishing", true);
   load_time_data->SetString(
       "heading",
       l10n_util::GetStringUTF16(IDS_PHISHING_V3_HEADING));
   load_time_data->SetString(
       "primaryParagraph",
       l10n_util::GetStringFUTF16(
           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));
 }