Remove Finch support for PasswordBranding

chrome/browser/password_manager/update_password_infobar_delegate_android.cc

Index: chrome/browser/password_manager/update_password_infobar_delegate_android.cc
diff --git a/chrome/browser/password_manager/update_password_infobar_delegate_android.cc b/chrome/browser/password_manager/update_password_infobar_delegate_android.cc
index 7331de5fa9de033f1b5c26ac6eb595416eaf6b55..ebc381addcc3bd3c239d38b13e5463ff01290dba 100644
--- a/chrome/browser/password_manager/update_password_infobar_delegate_android.cc
+++ b/chrome/browser/password_manager/update_password_infobar_delegate_android.cc
@@ -17,6 +17,7 @@
 #include "components/browser_sync/profile_sync_service.h"
 #include "components/infobars/core/infobar.h"
 #include "components/password_manager/core/browser/password_bubble_experiment.h"
+#include "components/strings/grit/components_strings.h"
 #include "content/public/browser/web_contents.h"
 #include "ui/base/l10n/l10n_util.h"
 
@@ -25,7 +26,7 @@ void UpdatePasswordInfoBarDelegate::Create(
     content::WebContents* web_contents,
     std::unique_ptr<password_manager::PasswordFormManager> form_to_save) {
   const bool is_smartlock_branding_enabled =
-      password_bubble_experiment::IsSmartLockBrandingSavePromptEnabled(
+      password_bubble_experiment::IsSmartLockUser(
           ProfileSyncServiceFactory::GetForProfile(
               Profile::FromBrowserContext(web_contents->GetBrowserContext())));
   InfoBarService::FromWebContents(web_contents)
@@ -38,10 +39,9 @@ void UpdatePasswordInfoBarDelegate::Create(
 UpdatePasswordInfoBarDelegate::~UpdatePasswordInfoBarDelegate() {}
 
 base::string16 UpdatePasswordInfoBarDelegate::GetBranding() const {
-  return l10n_util::GetStringUTF16(
-      is_smartlock_branding_enabled_
-          ? IDS_PASSWORD_MANAGER_SMART_LOCK_FOR_PASSWORDS
-          : IDS_PASSWORD_MANAGER_TITLE_BRAND);
+  return l10n_util::GetStringUTF16(is_smartlock_branding_enabled_
+                                       ? IDS_PASSWORD_MANAGER_SMART_LOCK

[vabr (Chromium), 2016/12/16 20:19:59]

The change to IDS_PASSWORD_MANAGER_SMART_LOCK from
IDS_PASSWORD_MANAGER_SMART_LOCK_FOR_PASSWORDS is a small fix, to make Android
use the same string as the other platforms (see manage_passwords_view_utils.cc).

[vasilii, 2016/12/19 13:31:02]

Acknowledged.

+                                       : IDS_PASSWORD_MANAGER_TITLE_BRAND);
 }
 
 bool UpdatePasswordInfoBarDelegate::ShowMultipleAccounts() const {