Remove Finch support for PasswordBranding

chrome/browser/ui/webui/options/password_manager_handler.cc

Index: chrome/browser/ui/webui/options/password_manager_handler.cc
diff --git a/chrome/browser/ui/webui/options/password_manager_handler.cc b/chrome/browser/ui/webui/options/password_manager_handler.cc
index 065eb4251402fc2585c9987e2cbb1f40015d1a44..890ea1763251d838653b17d13f86731960d03a49 100644
--- a/chrome/browser/ui/webui/options/password_manager_handler.cc
+++ b/chrome/browser/ui/webui/options/password_manager_handler.cc
@@ -135,13 +135,8 @@ void PasswordManagerHandler::GetLocalizedValues(
 
   RegisterStrings(localized_strings, resources, arraysize(resources));
 
-  const browser_sync::ProfileSyncService* sync_service =
-      ProfileSyncServiceFactory::GetForProfile(GetProfile());
-  int title_id =
-      password_bubble_experiment::IsSmartLockBrandingEnabled(sync_service)
-          ? IDS_PASSWORD_MANAGER_SMART_LOCK_FOR_PASSWORDS
-          : IDS_PASSWORDS_EXCEPTIONS_WINDOW_TITLE;
-  RegisterTitle(localized_strings, "passwordsPage", title_id);
+  RegisterTitle(localized_strings, "passwordsPage",
+                IDS_PASSWORDS_EXCEPTIONS_WINDOW_TITLE);

[stevenjb, 2016/12/16 19:23:25]

Why not use IsSmartLockUser here?

[vabr (Chromium), 2016/12/16 19:47:39]

We had three levels of SmarLock branding: "none", "save-prompt-related-only",
and "full". We just launched (via Finch) 100%  "save-prompt-related-only".
password_bubble_experiment::IsSmartLockBrandingEnabled corresponds to "full", so
it is equivalent to |false| after the launch.

[stevenjb, 2016/12/19 18:26:49]

I was confused because in PS 8 or 9 other code still used
IDS_PASSWORD_MANAGER_SMART_LOCK_FOR_PASSWORD and it was still in
generated_resources.grd. I see that that has changed.

 
   localized_strings->SetString("passwordManagerLearnMoreURL",
                                chrome::kPasswordManagerLearnMoreURL);