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

chrome/browser/ui/passwords/password_bubble_experiment.cc

 // Copyright 2014 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.
 
 #include "chrome/browser/ui/passwords/password_bubble_experiment.h"
 
 #include "base/metrics/field_trial.h"
 #include "chrome/browser/password_manager/password_manager_util.h"
 #include "chrome/browser/signin/signin_manager_factory.h"
 #include "chrome/browser/sync/profile_sync_service_factory.h"
 
 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
 
 void RecordBubbleClosed(
     PrefService* prefs,
     password_manager::metrics_util::UIDismissalReason reason) {
   // 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