Reland: Remove Finch support for PasswordBranding

ios/chrome/browser/ui/settings/settings_collection_view_controller.mm

 // Copyright 2015 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.
 
 #import "ios/chrome/browser/ui/settings/settings_collection_view_controller.h"
 
 #include <memory>
 
 #import "base/ios/weak_nsobject.h"
 #import "base/mac/foundation_util.h"
 #import "base/mac/scoped_nsobject.h"
 #include "base/metrics/user_metrics.h"
 #include "base/scoped_observer.h"
 #include "base/strings/sys_string_conversions.h"
 #include "components/autofill/core/common/autofill_pref_names.h"
 #include "components/browser_sync/profile_sync_service.h"
 #include "components/keyed_service/core/service_access_type.h"
-#include "components/password_manager/core/browser/password_bubble_experiment.h"
 #include "components/password_manager/core/browser/password_store.h"
 #include "components/password_manager/core/common/password_manager_pref_names.h"
 #include "components/prefs/pref_change_registrar.h"
 #include "components/prefs/pref_service.h"
 #include "components/search_engines/util.h"
 #include "components/signin/core/browser/signin_manager.h"
 #include "components/signin/core/common/signin_pref_names.h"
 #include "components/strings/grit/components_strings.h"
 #include "ios/chrome/browser/application_context.h"
 #import "ios/chrome/browser/browser_state/chrome_browser_state.h"
@@ skipping 406 matching lines @@
       kSettingsSearchEngineCellId;
   return _defaultSearchEngineItem;
 }
 
 - (CollectionViewItem*)savePasswordsDetailItem {
   BOOL savePasswordsEnabled = _mainBrowserState->GetPrefs()->GetBoolean(
       password_manager::prefs::kPasswordManagerSavingEnabled);
   NSString* passwordsDetail = savePasswordsEnabled
                                   ? l10n_util::GetNSString(IDS_IOS_SETTING_ON)
                                   : l10n_util::GetNSString(IDS_IOS_SETTING_OFF);
-  int titleId = IDS_IOS_SAVE_PASSWORDS;
-  syncer::SyncService* syncService =
-      IOSChromeProfileSyncServiceFactory::GetForBrowserState(_mainBrowserState);
-  if (password_bubble_experiment::IsSmartLockBrandingEnabled(syncService)) {
-    titleId = IDS_IOS_SAVE_PASSWORDS_SMART_LOCK;
-  }
 
   _savePasswordsDetailItem.reset(
       [[self detailItemWithType:ItemTypeSavedPasswords
-                           text:l10n_util::GetNSString(titleId)
+                           text:l10n_util::GetNSString(IDS_IOS_SAVE_PASSWORDS)
                      detailText:passwordsDetail] retain]);
 
   return _savePasswordsDetailItem;
 }
 
 - (CollectionViewItem*)autoFillDetailItem {
   BOOL autofillEnabled = _mainBrowserState->GetPrefs()->GetBoolean(
       autofill::prefs::kAutofillEnabled);
   NSString* autofillDetail = autofillEnabled
                                  ? l10n_util::GetNSString(IDS_IOS_SETTING_ON)
@@ skipping 622 matching lines @@
     NSString* autofillDetail =
         autofillEnabled ? l10n_util::GetNSString(IDS_IOS_SETTING_ON)
                         : l10n_util::GetNSString(IDS_IOS_SETTING_OFF);
     _autoFillDetailItem.get().detailText = autofillDetail;
     [self reconfigureCellsForItems:@[ _autoFillDetailItem ]
            inSectionWithIdentifier:SectionIdentifierBasics];
   }
 }
 
 @end