[Merge M54] 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..daf6c4e9c311a930b55813add6245e4e816f8e90 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;
@@ -81,6 +82,14 @@ class ChromeInternalLogSource;
 // Since these methods are private, each user has to be explicitly declared
 // as a 'friend' below.
 class ChromeMetricsServiceAccessor : public metrics::MetricsServiceAccessor {
+ public:
+  // This test method is public so tests don't need to befriend this class.
+
+  // If arg is non-null, the value will be returned from future calls to
+  // IsMetricsAndCrashReportingEnabled().  Pointer must be valid until
+  // it is reset to null here.
+  static void SetMetricsAndCrashReportingForTesting(const bool* value);
+
  private:
   friend class ::CrashesDOMHandler;
   friend class ::FlashDOMHandler;
@@ -114,6 +123,7 @@ 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);