[Password Generation] Don't generate passwords 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 119 matching lines @@
       default:
         break;
     }
   }
   return enabled_probability;
 }
 
 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;
 }
 
 void ChromePasswordManagerClient::SetLogger(
     PasswordManagerLogger* logger) {
   // We should never be replacing one logger with a different one, because that
   // will leave the first without further updates, and the user likely confused.
   // TODO(vabr): For the reason above, before moving the internals page from
   // behind the flag, make sure to restrict the number of internals page
   // instances to 1 in normal profiles, and 0 in incognito.
@@ skipping 97 matching lines @@
           web_contents(),
           web_contents()->GetView()->GetNativeView());
   popup_controller_->Show(false /* display_password */);
 #endif  // #if defined(USE_AURA)
 }
 
 void ChromePasswordManagerClient::CommitFillPasswordForm(
     autofill::PasswordFormFillData* data) {
   driver_.FillPasswordForm(*data);
 }