Deprecate old Safe Browsing reporting opt-ins

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 171 matching lines @@
           kMalwareDetailsProceedDelayMilliSeconds),
       ui_manager_(ui_manager),
       report_loop_(NULL),
       is_main_frame_load_blocked_(IsMainPageLoadBlocked(unsafe_resources)),
       unsafe_resources_(unsafe_resources),
       proceeded_(false),
       web_contents_(web_contents),
       url_(unsafe_resources[0].url),
       interstitial_page_(NULL),
       has_expanded_see_more_section_(false),
-      reporting_checkbox_checked_(false),
       create_view_(true),
       num_visits_(-1) {
   bool malware = false;
   bool phishing = false;
   for (UnsafeResourceList::const_iterator iter = unsafe_resources_.begin();
        iter != unsafe_resources_.end(); ++iter) {
     const UnsafeResource& resource = *iter;
     SBThreatType threat_type = resource.threat_type;
     if (threat_type == SB_THREAT_TYPE_URL_MALWARE ||
         threat_type == SB_THREAT_TYPE_CLIENT_SIDE_MALWARE_URL) {
@@ skipping 236 matching lines @@
       web_contents_->GetBrowserContext());
   renderer_preferences_util::UpdateFromSystemSettings(prefs, profile);
  }
 
 void SafeBrowsingBlockingPage::SetReportingPreference(bool report) {
   Profile* profile = Profile::FromBrowserContext(
       web_contents_->GetBrowserContext());
   PrefService* pref = profile->GetPrefs();
   pref->SetBoolean(prefs::kSafeBrowsingExtendedReportingEnabled, report);
   UMA_HISTOGRAM_BOOLEAN("SB2.SetExtendedReportingEnabled", report);
-  reporting_checkbox_checked_ = report;
-  pref->ClearPref(prefs::kSafeBrowsingReportingEnabled);
-  pref->ClearPref(prefs::kSafeBrowsingDownloadFeedbackEnabled);
-}
-
-// If the reporting checkbox was left checked on close, the new pref
-// kSafeBrowsingExtendedReportingEnabled should be updated.
-// TODO(felt): Remove this in M-39. crbug.com/384668
-void SafeBrowsingBlockingPage::UpdateReportingPref() {
-  if (!reporting_checkbox_checked_)
-    return;
-  if (IsPrefEnabled(prefs::kSafeBrowsingExtendedReportingEnabled))
-    return;
-  Profile* profile = Profile::FromBrowserContext(
-      web_contents_->GetBrowserContext());
-  if (profile->GetPrefs()->HasPrefPath(
-      prefs::kSafeBrowsingExtendedReportingEnabled))
-    return;
-  SetReportingPreference(true);
 }
 
 void SafeBrowsingBlockingPage::OnProceed() {
   proceeded_ = true;
   RecordUserAction(PROCEED);
-  UpdateReportingPref();
   // Send the malware details, if we opted to.
   FinishMalwareDetails(malware_details_proceed_delay_ms_);
 
   NotifySafeBrowsingUIManager(ui_manager_, unsafe_resources_, true);
 
   // Check to see if some new notifications of unsafe resources have been
   // received while we were showing the interstitial.
   UnsafeResourceMap* unsafe_resource_map = GetUnsafeResourcesMap();
   UnsafeResourceMap::iterator iter = unsafe_resource_map->find(web_contents_);
   SafeBrowsingBlockingPage* blocking_page = NULL;
@@ skipping 32 matching lines @@
 
 void SafeBrowsingBlockingPage::OnDontProceed() {
   // Calling this method twice will not double-count.
   RecordUserReactionTime(kNavigatedAwayMetaCommand);
   // We could have already called Proceed(), in which case we must not notify
   // the SafeBrowsingUIManager again, as the client has been deleted.
   if (proceeded_)
     return;
 
   RecordUserAction(DONT_PROCEED);
-  UpdateReportingPref();
   // Send the malware details, if we opted to.
   FinishMalwareDetails(0);  // No delay
 
   NotifySafeBrowsingUIManager(ui_manager_, unsafe_resources_, false);
 
   // The user does not want to proceed, clear the queued unsafe resources
   // notifications we received while the interstitial was showing.
   UnsafeResourceMap* unsafe_resource_map = GetUnsafeResourcesMap();
   UnsafeResourceMap::iterator iter = unsafe_resource_map->find(web_contents_);
   if (iter != unsafe_resource_map->end() && !iter->second.empty()) {
@@ skipping 392 matching lines @@
         kPrivacyLinkHtml,
         l10n_util::GetStringUTF8(
             IDS_SAFE_BROWSING_PRIVACY_POLICY_PAGE).c_str());
     load_time_data->SetString(
         "optInLink",
         l10n_util::GetStringFUTF16(IDS_SAFE_BROWSING_MALWARE_REPORTING_AGREE,
                                    base::UTF8ToUTF16(privacy_link)));
     Profile* profile = Profile::FromBrowserContext(
        web_contents_->GetBrowserContext());
     if (profile->GetPrefs()->HasPrefPath(
             prefs::kSafeBrowsingExtendedReportingEnabled)) {

[mattm, 2014/08/28 20:57:01]

This HasPrefPath shouldn't be needed anymore

[felt, 2014/08/28 21:43:30]

you're right. re-tested with both clean and dirty state, it appears to work now.

-      reporting_checkbox_checked_ =
-          IsPrefEnabled(prefs::kSafeBrowsingExtendedReportingEnabled);
-    } else if (IsPrefEnabled(prefs::kSafeBrowsingReportingEnabled) ||
-         IsPrefEnabled(prefs::kSafeBrowsingDownloadFeedbackEnabled)) {
-      reporting_checkbox_checked_ = true;
+      load_time_data->SetBoolean(
+          kBoxChecked,
+          IsPrefEnabled(prefs::kSafeBrowsingExtendedReportingEnabled));
     }
-    load_time_data->SetBoolean(
-        kBoxChecked, reporting_checkbox_checked_);
+
   }
 }
 
 void SafeBrowsingBlockingPage::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));
 }