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

chrome/browser/metrics/chrome_metrics_service_accessor.h

Index: chrome/browser/metrics/chrome_metrics_service_accessor.h
diff --git a/chrome/browser/metrics/chrome_metrics_service_accessor.h b/chrome/browser/metrics/chrome_metrics_service_accessor.h
index 333cd127c8693b4ed9870d43fd9aeceb073243fa..0295fbcc6065b319b63cd8316f8be55cbff53b1d 100644
--- a/chrome/browser/metrics/chrome_metrics_service_accessor.h
+++ b/chrome/browser/metrics/chrome_metrics_service_accessor.h
@@ -17,6 +17,7 @@
 class BrowserProcessImpl;
 class Profile;
 class ChromeMetricsServiceClient;
+class ChromePasswordManagerClient;
 
 namespace {
 class CrashesDOMHandler;
@@ -114,15 +115,25 @@ class ChromeMetricsServiceAccessor : public metrics::MetricsServiceAccessor {
   friend class safe_browsing::SafeBrowsingUIManager;
   friend void SyzyASANRegisterExperiment(const char*, const char*);
   friend class ChromeMetricsServiceClient;
+  friend class ChromePasswordManagerClient;
 
   FRIEND_TEST_ALL_PREFIXES(ChromeMetricsServiceAccessorTest,
                            MetricsReportingEnabled);
+  FRIEND_TEST_ALL_PREFIXES(ChromePasswordManagerClientTest,
+                           ShouldAnnotateNavigationEntry);
+
 
   // Returns true if metrics reporting is enabled.
   // TODO(gayane): Consolidate metric prefs on all platforms.
   // http://crbug.com/362192,  http://crbug.com/532084
   static bool IsMetricsAndCrashReportingEnabled();
 
+
+  // If poiner is non-null, the value will be returned from
+  // IsMetricsAndCrashReportingEnabled().  Pointer must be valid until
+  // it is reset to null.
+  static void SetMetricsAndCrashReportingForTesting(const bool* value);

[Alexei Svitkine (slow), 2016/09/02 18:05:45]

I'm OK with this being public so that further tests don't need to be added as
friends. The ForTesting suffix should make sure it doesn't make it into
production code.

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

Done.

+
   // Calls metrics::MetricsServiceAccessor::RegisterSyntheticFieldTrial() with
   // g_browser_process->metrics_service(). See that function's declaration for
   // details.