[Password Manager] Add UMA stats for custom passphrase users.

chrome/browser/password_manager/chrome_password_manager_client.cc

Index: chrome/browser/password_manager/chrome_password_manager_client.cc
diff --git a/chrome/browser/password_manager/chrome_password_manager_client.cc b/chrome/browser/password_manager/chrome_password_manager_client.cc
index f10d4870f7cad4c66ab43f75ffdc202b75a3cb93..e21351f1c2d7fa78d32b6c0e4399b9f59e7f085c 100644
--- a/chrome/browser/password_manager/chrome_password_manager_client.cc
+++ b/chrome/browser/password_manager/chrome_password_manager_client.cc
@@ -135,6 +135,10 @@ bool ChromePasswordManagerClient::ShouldFilterAutofillResult(
   return false;
 }
 
+std::string ChromePasswordManagerClient::GetSyncUsername() const {
+  return password_manager_sync_metrics::GetSyncUsername(profile_);
+}
+
 bool ChromePasswordManagerClient::IsSyncAccountCredential(
     const std::string& username, const std::string& origin) const {
   return password_manager_sync_metrics::IsSyncAccountCredential(
@@ -243,7 +247,8 @@ ChromePasswordManagerClient::GetProbabilityForExperiment(
   return enabled_probability;
 }
 
-bool ChromePasswordManagerClient::IsPasswordSyncEnabled() {
+bool ChromePasswordManagerClient::IsPasswordSyncEnabled(
+    password_manager::CustomPassphraseState state) {
   ProfileSyncService* sync_service =
       ProfileSyncServiceFactory::GetForProfile(profile_);
   // Don't consider sync enabled if the user has a custom passphrase. See
@@ -251,8 +256,11 @@ bool ChromePasswordManagerClient::IsPasswordSyncEnabled() {
   if (sync_service &&
       sync_service->HasSyncSetupCompleted() &&
       sync_service->SyncActive() &&
-      !sync_service->IsUsingSecondaryPassphrase()) {
-    return sync_service->GetActiveDataTypes().Has(syncer::PASSWORDS);
+      sync_service->GetActiveDataTypes().Has(syncer::PASSWORDS)) {
+    if (!((state == password_manager::ONLY_CUSTOM_PASSPHRASE_USERS) ^

[vabr (Chromium), 2014/10/13 09:24:18]

This is very hard to read, and ^ is a bitwise operator, not a logical one.
Please consider coding this as:

if ((state == password_manager::ONLY_CUSTOM_PASSPHRASE_USERS) ==
sync_service->IsUsingSecondaryPassphrase())

[Garrett Casto, 2014/10/13 20:57:56]

I actually decided to be even more readable here. and split this out into two
different statements. Hopefully this addresses your comment.

[vabr (Chromium), 2014/10/14 07:32:51]

The new version looks great. Thanks!

+          (sync_service->IsUsingSecondaryPassphrase()))) {
+      return true;
+    }
   }
   return false;
 }