[Password Manager] Fix IsEnabledSmartLockBranding

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 a64bd5778a8f4cbafa1efc1889b7c59c6359d802..ec977b1b5fcd3a18b08889a9c0c3766bc84605b3 100644
--- a/chrome/browser/ui/passwords/password_bubble_experiment.cc
+++ b/chrome/browser/ui/passwords/password_bubble_experiment.cc
@@ -5,8 +5,10 @@
 #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 "components/signin/core/browser/signin_manager.h"
+#include "chrome/browser/sync/profile_sync_service.h"

[engedy, 2015/05/13 14:41:20]

nit: I think this include is not needed. The factory should already forward
declare the product type.

[vabr (Chromium), 2015/05/13 14:55:06]

Done. But not in the client -- the factory only forward-declares the
ProfileSyncService, and the client still needs to actually know the definition.

[engedy, 2015/05/13 14:57:33]

Yeah, I only meant removing the include here.

+#include "chrome/browser/sync/profile_sync_service_factory.h"
 
 namespace password_bubble_experiment {
 namespace {
@@ -23,8 +25,9 @@ void RecordBubbleClosed(
 }
 
 bool IsEnabledSmartLockBranding(Profile* profile) {
-  SigninManagerBase* signin = SigninManagerFactory::GetForProfile(profile);
-  return (signin && signin->IsAuthenticated() &&
+  const ProfileSyncService* sync_service =
+      ProfileSyncServiceFactory::GetForProfile(profile);
+  return (password_manager_util::GetPasswordSyncState(sync_service) &&

[engedy, 2015/05/13 14:41:20]

nit: Are these enclossing parens needed for clang-format to avoid uglification
of the code? If not, we could drop them.

[vabr (Chromium), 2015/05/13 14:55:06]

Done.

           base::FieldTrialList::FindFullName(kBrandingExperimentName) ==
               kSmartLockBrandingGroupName);
 }