Revert "[iOS] Add Safe Browsing opt out setting."

This reverts commit e033ca47.

Reason for revert: Not needed yet.

Original change's description:
> [iOS] Add Safe Browsing opt out setting.
> 
> Bug: none
> Change-Id: Iaf328b22a6fba65a1d9a6deb837f379cd9405b5e
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2088187
> Commit-Queue: Kurt Horimoto <kkhorimoto@chromium.org>
> Reviewed-by: Rohit Rao <rohitrao@chromium.org>
> Reviewed-by: Ali Juma <ajuma@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#751135}

TBR=rohitrao@chromium.org,ajuma@chromium.org,kkhorimoto@chromium.org

# Not skipping CQ checks because original CL landed > 1 day ago.

Bug: none
Change-Id: Ibc388798926a634d76b014b2f8dd931d22b6f7b3
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2130666Reviewed-by: Kurt Horimoto <kkhorimoto@chromium.org>
Commit-Queue: Kurt Horimoto <kkhorimoto@chromium.org>
Cr-Commit-Position: refs/heads/master@{#755117}

ios/chrome/app/strings/ios_strings.grd

@@ -782,12 +782,6 @@ locale.  The strings in this file are specific to iOS.
       <message name="IDS_IOS_GOOGLE_SERVICES_SETTINGS_AUTOCOMPLETE_SEARCHES_AND_URLS_TEXT" desc="Feature title in the settings for the user to enable/disable, to have autocomplete searches and URLs. Text related to 'Sends searches from the address bar and search box, and some cookies to your default search engine' [iOS only]">
         Autocomplete Searches and URLs
       </message>
-      <message name="IDS_IOS_GOOGLE_SERVICES_SETTINGS_SAFE_BROWSING_DETAIL" desc="Feature detail text in the setting to enable/disable safe browsing">
-        Sends URLs of some pages you visit to Google, when your security is at risk 
-      </message>
-      <message name="IDS_IOS_GOOGLE_SERVICES_SETTINGS_SAFE_BROWSING_TEXT" desc="The section title of 'Protects you and your device from dangerous sites'">
-        Safe Browsing (protects you and your device from dangerous sites)
-      </message>
       <message name="IDS_IOS_GOOGLE_SERVICES_SETTINGS_BETTER_SEARCH_AND_BROWSING_DETAIL" desc="Detail text for a feature in the settings for the user to enable/disable, to make searches andn browsing better. Related to 'Make searches and browsing better'. [iOS only]">
         Sends URLs of pages you visit to Google.
       </message>

ios/chrome/app/strings/ios_strings_grd/IDS_IOS_GOOGLE_SERVICES_SETTINGS_SAFE_BROWSING_DETAIL.png.sha1

-8d5ac95eb4a3f7d3ef575f237309e1f8c7a50bae
\ No newline at end of file

ios/chrome/app/strings/ios_strings_grd/IDS_IOS_GOOGLE_SERVICES_SETTINGS_SAFE_BROWSING_TEXT.png.sha1

-8d5ac95eb4a3f7d3ef575f237309e1f8c7a50bae
\ No newline at end of file

ios/chrome/browser/prefs/BUILD.gn

@@ -82,7 +82,6 @@ source_set("browser_prefs") {
     "//ios/chrome/browser/voice:prefs",
     "//ios/chrome/browser/web",
     "//ios/public/provider/chrome/browser",
-    "//ios/web/common:features",
     "//ui/base",
   ]
 }

ios/chrome/browser/prefs/browser_prefs.mm

@@ -65,7 +65,6 @@
 #include "ios/chrome/browser/voice/voice_search_prefs_registration.h"
 #import "ios/chrome/browser/web/font_size_tab_helper.h"
 #include "ios/public/provider/chrome/browser/chrome_browser_provider.h"
-#import "ios/web/common/features.h"
 #include "ui/base/l10n/l10n_util.h"
 
 #if !defined(__has_feature) || !__has_feature(objc_arc)

ios/chrome/browser/ui/settings/google_services/BUILD.gn

@@ -40,8 +40,6 @@ source_set("google_services") {
     "//components/metrics",
     "//components/password_manager/core/common",
     "//components/prefs",
-    "//components/safe_browsing/core:features",
-    "//components/safe_browsing/core/common:safe_browsing_prefs",
     "//components/signin/public/identity_manager",
     "//components/signin/public/identity_manager/objc",
     "//components/strings",
@@ -76,7 +74,6 @@ source_set("google_services") {
     "//ios/public/provider/chrome/browser",
     "//ios/public/provider/chrome/browser/images",
     "//ios/public/provider/chrome/browser/signin",
-    "//ios/web/common:features",
     "//ui/base",
   ]
   allow_circular_includes_from = [

ios/chrome/browser/ui/settings/google_services/google_services_settings_mediator.mm

@@ -10,8 +10,6 @@
 #include "components/password_manager/core/common/password_manager_features.h"
 #include "components/password_manager/core/common/password_manager_pref_names.h"
 #include "components/prefs/pref_service.h"
-#include "components/safe_browsing/core/common/safe_browsing_prefs.h"
-#include "components/safe_browsing/core/features.h"
 #import "components/signin/public/identity_manager/objc/identity_manager_observer_bridge.h"
 #include "components/sync/driver/sync_service.h"
 #include "components/ukm/ios/features.h"
@@ -46,7 +44,6 @@
 #endif
 
 using l10n_util::GetNSString;
-using safe_browsing::kSafeBrowsingAvailableOnIOS;
 
 typedef NSArray<TableViewItem*>* ItemArray;
 
@@ -83,7 +80,6 @@ typedef NS_ENUM(NSInteger, ItemType) {
   ManageSyncItemType,
   // NonPersonalizedSectionIdentifier section.
   AutocompleteSearchesAndURLsItemType,
-  SafeBrowsingItemType,
   ImproveChromeItemType,
   BetterSearchAndBrowsingItemType,
   ItemTypePasswordLeakCheckSwitch,
@@ -139,9 +135,6 @@ NSString* kGoogleServicesSyncErrorImage = @"google_services_sync_error";
 // Preference value for the "Autocomplete searches and URLs" feature.
 @property(nonatomic, strong, readonly)
     PrefBackedBoolean* autocompleteSearchPreference;
-// Preference value for the "Safe Browsing" feature.
-@property(nonatomic, strong, readonly)
-    PrefBackedBoolean* safeBrowsingPreference;
 // Preference value for the "Help improve Chromium's features" feature.
 @property(nonatomic, strong, readonly)
     PrefBackedBoolean* sendDataUsagePreference;
@@ -186,12 +179,6 @@ NSString* kGoogleServicesSyncErrorImage = @"google_services_sync_error";
         initWithPrefService:userPrefService
                    prefName:prefs::kSearchSuggestEnabled];
     _autocompleteSearchPreference.observer = self;
-    if (base::FeatureList::IsEnabled(kSafeBrowsingAvailableOnIOS)) {
-      _safeBrowsingPreference = [[PrefBackedBoolean alloc]
-          initWithPrefService:userPrefService
-                     prefName:prefs::kSafeBrowsingEnabled];
-      _safeBrowsingPreference.observer = self;
-    }
     _sendDataUsagePreference = [[PrefBackedBoolean alloc]
         initWithPrefService:localPrefService
                    prefName:metrics::prefs::kMetricsReportingEnabled];
@@ -523,9 +510,6 @@ NSString* kGoogleServicesSyncErrorImage = @"google_services_sync_error";
       case AutocompleteSearchesAndURLsItemType:
         switchItem.on = self.autocompleteSearchPreference.value;
         break;
-      case SafeBrowsingItemType:
-        switchItem.on = self.safeBrowsingPreference.value;
-        break;
       case ImproveChromeItemType:
         switchItem.on = self.sendDataUsagePreference.value;
         break;
@@ -579,26 +563,13 @@ NSString* kGoogleServicesSyncErrorImage = @"google_services_sync_error";
 
 - (ItemArray)nonPersonalizedItems {
   if (!_nonPersonalizedItems) {
-    NSMutableArray* items = [NSMutableArray array];
-    SyncSwitchItem* autocompleteItem = [self
+    SyncSwitchItem* autocompleteSearchesAndURLsItem = [self
         switchItemWithItemType:AutocompleteSearchesAndURLsItemType
                   textStringID:
-            IDS_IOS_GOOGLE_SERVICES_SETTINGS_AUTOCOMPLETE_SEARCHES_AND_URLS_TEXT
+                      IDS_IOS_GOOGLE_SERVICES_SETTINGS_AUTOCOMPLETE_SEARCHES_AND_URLS_TEXT
                 detailStringID:
-          IDS_IOS_GOOGLE_SERVICES_SETTINGS_AUTOCOMPLETE_SEARCHES_AND_URLS_DETAIL
+                    IDS_IOS_GOOGLE_SERVICES_SETTINGS_AUTOCOMPLETE_SEARCHES_AND_URLS_DETAIL
                       dataType:0];
-    [items addObject:autocompleteItem];
-    if (base::FeatureList::IsEnabled(kSafeBrowsingAvailableOnIOS)) {
-      SyncSwitchItem* safeBrowsingItem = [self
-          switchItemWithItemType:SafeBrowsingItemType
-                    textStringID:
-                        IDS_IOS_GOOGLE_SERVICES_SETTINGS_SAFE_BROWSING_TEXT
-                  detailStringID:
-                      IDS_IOS_GOOGLE_SERVICES_SETTINGS_SAFE_BROWSING_DETAIL
-                        dataType:0];
-      [items addObject:safeBrowsingItem];
-    }
-    [items addObject:self.passwordLeakCheckItem];
     SyncSwitchItem* improveChromeItem =
         [self switchItemWithItemType:ImproveChromeItemType
                         textStringID:
@@ -606,18 +577,19 @@ NSString* kGoogleServicesSyncErrorImage = @"google_services_sync_error";
                       detailStringID:
                           IDS_IOS_GOOGLE_SERVICES_SETTINGS_IMPROVE_CHROME_DETAIL
                             dataType:0];
-    [items addObject:improveChromeItem];
     SyncSwitchItem* betterSearchAndBrowsingItemType = [self
         switchItemWithItemType:BetterSearchAndBrowsingItemType
                   textStringID:
-                IDS_IOS_GOOGLE_SERVICES_SETTINGS_BETTER_SEARCH_AND_BROWSING_TEXT
+                      IDS_IOS_GOOGLE_SERVICES_SETTINGS_BETTER_SEARCH_AND_BROWSING_TEXT
                 detailStringID:
-              IDS_IOS_GOOGLE_SERVICES_SETTINGS_BETTER_SEARCH_AND_BROWSING_DETAIL
+                    IDS_IOS_GOOGLE_SERVICES_SETTINGS_BETTER_SEARCH_AND_BROWSING_DETAIL
                       dataType:0];
     betterSearchAndBrowsingItemType.accessibilityIdentifier =
         kBetterSearchAndBrowsingItemAccessibilityID;
-    [items addObject:betterSearchAndBrowsingItemType];
-    _nonPersonalizedItems = items;
+    _nonPersonalizedItems = @[
+      autocompleteSearchesAndURLsItem, self.passwordLeakCheckItem,
+      improveChromeItem, betterSearchAndBrowsingItemType
+    ];
   }
   return _nonPersonalizedItems;
 }
@@ -760,9 +732,6 @@ NSString* kGoogleServicesSyncErrorImage = @"google_services_sync_error";
     case AutocompleteSearchesAndURLsItemType:
       self.autocompleteSearchPreference.value = value;
       break;
-    case SafeBrowsingItemType:
-      self.safeBrowsingPreference.value = value;
-      break;
     case ImproveChromeItemType:
       self.sendDataUsagePreference.value = value;
       // Don't set value if sendDataUsageWifiOnlyPreference has not been
@@ -841,7 +810,6 @@ NSString* kGoogleServicesSyncErrorImage = @"google_services_sync_error";
     case SyncDisabledByAdministratorErrorItemType:
     case SyncSettingsNotCofirmedErrorItemType:
     case AutocompleteSearchesAndURLsItemType:
-    case SafeBrowsingItemType:
     case ItemTypePasswordLeakCheckSwitch:
     case ImproveChromeItemType:
     case BetterSearchAndBrowsingItemType: