Unify the two malware reporting opt-ins

This unifies the two malware reporting opt-ins.

- One string for both places
- One pref
- One opt-out in Settings
- The default value of the checkbox is based on both the old and the new prefs

BUG=383866

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@277536 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 7 insertions, 0 deletions

diff --git a/chrome/common/pref_names.cc b/chrome/common/pref_names.cc
index 9fc4a7d..ab0b57d 100644
--- a/chrome/common/pref_names.cc
+++ b/chrome/common/pref_names.cc
@@ -293,10 +293,16 @@ const char kWebKitPluginsEnabled[] = "webkit.webprefs.plugins_enabled";
 const char kSafeBrowsingEnabled[] = "safebrowsing.enabled";
 
 // Boolean that tell us whether malicious download feedback is enabled.
+const char kSafeBrowsingExtendedReportingEnabled[] =
+    "safebrowsing.extended_reporting_enabled";
+
+// Boolean that tell us whether malicious download feedback is enabled.
+// TODO(felt): Deprecate. crbug.com/383866
 const char kSafeBrowsingDownloadFeedbackEnabled[] =
     "safebrowsing.download_feedback_enabled";
 
 // Boolean that is true when SafeBrowsing Malware Report is enabled.
+// TODO(felt): Deprecate. crbug.com/383866
 const char kSafeBrowsingReportingEnabled[] =
     "safebrowsing.reporting_enabled";
 
diff --git a/chrome/common/pref_names.h b/chrome/common/pref_names.h
index 83af07a..db04800a 100644
--- a/chrome/common/pref_names.h
+++ b/chrome/common/pref_names.h
@@ -132,6 +132,7 @@ extern const char kWebKitForceEnableZoom[];
 extern const char kWebKitPasswordEchoEnabled[];
 #endif
 extern const char kSafeBrowsingEnabled[];
+extern const char kSafeBrowsingExtendedReportingEnabled[];
 extern const char kSafeBrowsingDownloadFeedbackEnabled[];
 extern const char kSafeBrowsingReportingEnabled[];
 extern const char kSafeBrowsingProceedAnywayDisabled[];