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

chrome/browser/password_manager/chrome_password_manager_client.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/password_manager/chrome_password_manager_client.h"
 
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/memory/singleton.h"
 #include "base/metrics/histogram.h"
@@ skipping 117 matching lines @@
 
   if (autofill_sync_state_ == DISALLOW_SYNC_CREDENTIALS_FOR_REAUTH &&
       LastLoadWasTransactionalReauthPage()) {
     sync_credential_was_filtered_ = true;
     return true;
   }
 
   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(
       profile_, username, origin);
 }
 
 void ChromePasswordManagerClient::AutofillResultsComputed() {
   UMA_HISTOGRAM_BOOLEAN("PasswordManager.SyncCredentialFiltered",
                         sync_credential_was_filtered_);
   sync_credential_was_filtered_ = false;
@@ skipping 88 matching lines @@
       case chrome::VersionInfo::CHANNEL_BETA:
         enabled_probability = 50;
         break;
       default:
         break;
     }
   }
   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
   // crbug.com/358998 for more details.
   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;
 }
 
 void ChromePasswordManagerClient::OnLogRouterAvailabilityChanged(
     bool router_can_be_used) {
   if (can_use_log_router_ == router_can_be_used)
     return;
   can_use_log_router_ = router_can_be_used;
 
@@ skipping 226 matching lines @@
 
   if (group_name == "DisallowSyncCredentialsForReauth") {
     autofill_sync_state_ = DISALLOW_SYNC_CREDENTIALS_FOR_REAUTH;
   } else if (group_name == "DisallowSyncCredentials") {
       autofill_sync_state_ = DISALLOW_SYNC_CREDENTIALS;
   } else {
     // Allow by default.
     autofill_sync_state_ = ALLOW_SYNC_CREDENTIALS;
   }
 }