[Smart Lock] Update password generation prompt to conditionally use new branding

chrome/browser/ui/passwords/password_bubble_experiment.cc

Index: chrome/browser/ui/passwords/password_bubble_experiment.cc
diff --git a/chrome/browser/ui/passwords/password_bubble_experiment.cc b/chrome/browser/ui/passwords/password_bubble_experiment.cc
index 4402e801f685778c8e7d0651eb232e80c5c152b3..0988d2b3dde6125df39141861085a6fe7d34183e 100644
--- a/chrome/browser/ui/passwords/password_bubble_experiment.cc
+++ b/chrome/browser/ui/passwords/password_bubble_experiment.cc
@@ -12,7 +12,7 @@
 namespace password_bubble_experiment {
 namespace {
 
-const char kBrandingExperimentName[] = "PasswordBubbleBranding";
+const char kBrandingExperimentName[] = "PasswordBranding";

[vabr (Chromium), 2015/05/15 11:24:45]

I'll change the Finch config in the internal CL 93306312 to reflect this once
the CL lands. Mentioning it here to highlight a potential clash just in case you
also were adding some Finch configs.

 const char kSmartLockBrandingGroupName[] = "SmartLockBranding";
 
 } // namespace
@@ -23,13 +23,15 @@ void RecordBubbleClosed(
   // TODO(vasilii): store the statistics.
 }
 
-bool IsEnabledSmartLockBranding(Profile* profile) {
+bool IsSmartLockBrandingEnabled(Profile* profile) {
   const ProfileSyncService* sync_service =
       ProfileSyncServiceFactory::GetForProfile(profile);
-  return password_manager_util::GetPasswordSyncState(sync_service) &&
-         base::FieldTrialList::FindFullName(kBrandingExperimentName) ==
-             kSmartLockBrandingGroupName;
-}
+  if (password_manager_util::GetPasswordSyncState(sync_service) !=
+      password_manager::SYNCING_NORMAL_ENCRYPTION)
+    return false;
 
+  return base::FieldTrialList::FindFullName(kBrandingExperimentName) ==
+      kSmartLockBrandingGroupName;
+}
 
 }  // namespace password_bubble_experiment