Remove Finch support for PasswordBranding

chrome/android/java/src/org/chromium/chrome/browser/preferences/MainPreferences.java

Index: chrome/android/java/src/org/chromium/chrome/browser/preferences/MainPreferences.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/MainPreferences.java b/chrome/android/java/src/org/chromium/chrome/browser/preferences/MainPreferences.java
index e79b434d40e8bc79f6ef92a1d587595b7d074ad7..8d0679a67fa97d67371162c07ff04b9de1d61ecf 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/preferences/MainPreferences.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/preferences/MainPreferences.java
@@ -131,13 +131,7 @@ public class MainPreferences extends PreferenceFragment
             passwordsPref.setOnPreferenceClickListener(this);
             passwordsPref.setManagedPreferenceDelegate(null);
         } else {
-            if (PasswordUIView.shouldUseSmartLockBranding()) {
-                passwordsPref.setTitle(getResources().getString(
-                         R.string.prefs_smart_lock_for_passwords));

[vasilii, 2016/12/16 16:56:53]

Do you want to delete IDS_PREFS_SMART_LOCK_FOR_PASSWORDS in
android_chrome_strings.grd?

[vabr (Chromium), 2016/12/16 18:56:27]

I do. Thanks for pointing out what the IDS_* name is given the strange Java
notation!

-            } else {
-                passwordsPref.setTitle(getResources().getString(
-                          R.string.prefs_saved_passwords));
-            }
+            passwordsPref.setTitle(getResources().getString(R.string.prefs_saved_passwords));
             passwordsPref.setFragment(SavePasswordsPreferences.class.getCanonicalName());
             setOnOffSummary(passwordsPref,
                     PrefServiceBridge.getInstance().isRememberPasswordsEnabled());