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

chrome/browser/password_manager/chrome_password_manager_client.h

Index: chrome/browser/password_manager/chrome_password_manager_client.h
diff --git a/chrome/browser/password_manager/chrome_password_manager_client.h b/chrome/browser/password_manager/chrome_password_manager_client.h
index 8688ff83f261bb8cfb09c60243b393f6d25c79e8..091e430f007c03644bc3ba725feacaf13f094248 100644
--- a/chrome/browser/password_manager/chrome_password_manager_client.h
+++ b/chrome/browser/password_manager/chrome_password_manager_client.h
@@ -165,6 +165,10 @@ class ChromePasswordManagerClient
                            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_;
@@ -195,6 +199,9 @@ class ChromePasswordManagerClient
   // 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);
 };