[Password Generation] Don't generate passwords 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 fee36e2697e784cae429a022077d5856577e18ad..c31c7c12098f10847d884dcd41556ee363ffb7cd 100644
--- a/chrome/browser/password_manager/chrome_password_manager_client.cc
+++ b/chrome/browser/password_manager/chrome_password_manager_client.cc
@@ -137,8 +137,13 @@ ChromePasswordManagerClient::GetProbabilityForExperiment(
 bool ChromePasswordManagerClient::IsPasswordSyncEnabled() {
   ProfileSyncService* sync_service =
       ProfileSyncServiceFactory::GetForProfile(GetProfile());
-  if (sync_service && sync_service->HasSyncSetupCompleted())
+  // 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->IsPassphraseRequired()) {

[Nicolas Zea, 2014/04/10 19:53:07]

You should instead check !sync_service->IsUsingSecondaryPassphrase()

[Garrett Casto, 2014/04/10 20:10:08]

Fixed.

     return sync_service->GetActiveDataTypes().Has(syncer::PASSWORDS);
+  }
   return false;
 }