Only report PasswordState in Sync for UMA+non-custom passphrase users.

chrome/browser/password_manager/chrome_password_manager_client.h

 // 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.
 
 #ifndef CHROME_BROWSER_PASSWORD_MANAGER_CHROME_PASSWORD_MANAGER_CLIENT_H_
 #define CHROME_BROWSER_PASSWORD_MANAGER_CHROME_PASSWORD_MANAGER_CLIENT_H_
 
 #include <memory>
 #include <vector>
 
@@ skipping 147 matching lines @@
   // for UMA stats.
   void GenerationAvailableForForm(const autofill::PasswordForm& form);
 
   // Called as a response to PromptUserToChooseCredentials. nullptr in |form|
   // means that nothing was chosen. |one_local_credential| is true if there was
   // just one local credential to be chosen from.
   void OnCredentialsChosen(const CredentialsCallback& callback,
                            bool one_local_credential,
                            const autofill::PasswordForm* form);
 
+  // Returns true if this profile has metrics reporting and doesn't have

[vabr (Chromium), 2016/09/02 09:12:20]

nit: The current phrasing is unclear about the necessity of sync being set up.
What about:

// Returns true if this profile has metrics reporting and active sync without a
custom sync passphrase.

[Nathan Parker, 2016/09/02 22:42:36]

Done.

+  // a custom sync passphrase.
+  static bool ShouldAnnotateNavigationEntries(Profile* profile);
+
   Profile* const profile_;
 
   password_manager::PasswordManager password_manager_;
 
   password_manager::ContentPasswordManagerDriverFactory* driver_factory_;
 
   // As a mojo service, will be registered into service registry
   // of the main frame host by ChromeContentBrowserClient
   // once main frame host was created.
   password_manager::CredentialManagerImpl credential_manager_impl_;
@@ skipping 10 matching lines @@
   BooleanPrefMember saving_and_filling_passwords_enabled_;
 
   const password_manager::SyncCredentialsFilter credentials_filter_;
 
   std::unique_ptr<password_manager::LogManager> log_manager_;
 
   // Set during 'NotifyUserCouldBeAutoSignedIn' in order to store the
   // form for potential use during 'NotifySuccessfulLoginWithExistingPassword'.
   std::unique_ptr<autofill::PasswordForm> possible_auto_sign_in_;
 
+  FRIEND_TEST_ALL_PREFIXES(ChromePasswordManagerClientTest,

[vabr (Chromium), 2016/09/02 09:12:20]

Please do not friend the test. We try hard to eliminate that from our code.
Tests should use public API to interact with the tested class.

In this case, the nearest public API to call in the test is
ChromePasswordManagerClient::AnnotateNavigationEntry. When the annotation is not
cancelled because of ShouldAnnotateNavigationEntry, you should be able to check
the last committed entry for the annotation.

[Nathan Parker, 2016/09/02 22:42:36]

Interesting, good idea in general.  Done.  And I tested more functionality.

+                           ShouldAnnotateNavigationEntry);
+
   DISALLOW_COPY_AND_ASSIGN(ChromePasswordManagerClient);
 };
 
 #endif  // CHROME_BROWSER_PASSWORD_MANAGER_CHROME_PASSWORD_MANAGER_CLIENT_H_