Remove legacy SBER pref from Android UIs.

The legacy SBER pref has been completely replaced by the Scout pref.
This change removes the legacy SBER string and removes the checkbox from
the unified and un-unified UIs.

Bug: 662944
Change-Id: Icae674d21de1782dfaef5cc125a9bc79cbf4fa1a
Reviewed-on: https://chromium-review.googlesource.com/c/1312624Reviewed-by: Theresa <twellington@chromium.org>
Commit-Queue: Luke Z <lpz@chromium.org>
Cr-Commit-Position: refs/heads/master@{#604642}

chrome/android/java/res/xml/privacy_preferences.xml

@@ -17,10 +17,6 @@
         android:title="@string/search_suggestions_title"
         android:summary="@string/search_suggestions_summary"
         android:defaultValue="true" />
-    <org.chromium.chrome.browser.preferences.ChromeBaseCheckBoxPreference
-        android:key="safe_browsing_extended_reporting"
-        android:title="@string/safe_browsing_extended_reporting_title"
-        android:summary="@string/safe_browsing_extended_reporting_summary" />
     <org.chromium.chrome.browser.preferences.ChromeBaseCheckBoxPreference
         android:key="safe_browsing_scout_reporting"
         android:title="@string/safe_browsing_scout_reporting_title"

chrome/android/java/res/xml/sync_and_services_preferences.xml

@@ -104,10 +104,6 @@
             android:key="safe_browsing"
             android:title="@string/safe_browsing_title"
             android:summary="@string/safe_browsing_summary"/>
-        <org.chromium.chrome.browser.preferences.ChromeBaseCheckBoxPreference
-            android:key="safe_browsing_extended_reporting"
-            android:title="@string/safe_browsing_extended_reporting_title"
-            android:summary="@string/safe_browsing_extended_reporting_summary"/>
         <org.chromium.chrome.browser.preferences.ChromeBaseCheckBoxPreference
             android:key="safe_browsing_scout_reporting"
             android:title="@string/safe_browsing_scout_reporting_title"

chrome/android/java/strings/android_chrome_strings.grd

@@ -682,12 +682,6 @@ CHAR-LIMIT guidelines:
       <message name="IDS_SEARCH_SUGGESTIONS_SUMMARY" desc="Summary for search and url suggestions.">
         Use a prediction service to show related queries and popular websites as you type in the address bar
       </message>
-      <message name="IDS_SAFE_BROWSING_EXTENDED_REPORTING_TITLE" desc="Title for checkbox that controls whether details of possible security incidents will be sent to Google.">
-        Security incidents
-      </message>
-      <message name="IDS_SAFE_BROWSING_EXTENDED_REPORTING_SUMMARY" desc="Summary for report security incidents.">
-        Automatically report details of possible security incidents to Google
-      </message>
       <message name="IDS_SAFE_BROWSING_SCOUT_REPORTING_TITLE" desc="Title for checkbox that controls reporting data to detect bad apps/sites. Please ensure ‘Safe Browsing’ in this message matches the ‘Safe Browsing’ settings title.">
         Help improve Safe Browsing
       </message>