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

chrome/browser/metrics/chrome_metrics_service_accessor.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_METRICS_CHROME_METRICS_SERVICE_ACCESSOR_H_
 #define CHROME_BROWSER_METRICS_CHROME_METRICS_SERVICE_ACCESSOR_H_
 
 #include <stdint.h>
 #include <string>
 #include <vector>
 
 #include "base/gtest_prod_util.h"
 #include "base/macros.h"
 #include "chrome/browser/metrics/metrics_reporting_state.h"
 #include "components/metrics/metrics_service_accessor.h"
 
 class BrowserProcessImpl;
 class Profile;
 class ChromeMetricsServiceClient;
+class ChromePasswordManagerClient;
 
 namespace {
 class CrashesDOMHandler;
 class FlashDOMHandler;
 }
 
 namespace chrome {
 void AttemptRestart();
 namespace android {
 class ExternalDataUseObserverBridge;
@@ skipping 77 matching lines @@
   friend class StackSamplingConfiguration;
   friend class system_logs::ChromeInternalLogSource;
   friend class UmaSessionStats;
   friend class safe_browsing::SRTFetcher;
   friend class safe_browsing::SRTGlobalError;
   friend class safe_browsing::DownloadSBClient;
   friend class safe_browsing::SafeBrowsingService;
   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.
   static bool RegisterSyntheticFieldTrial(const std::string& trial_name,
                                           const std::string& group_name);
 
   // Calls MetricsServiceAccessor::RegisterSyntheticMultiGroupFieldTrial() with
   // g_browser_process->metrics_service(). See that function's declaration for
   // details.
   static bool RegisterSyntheticMultiGroupFieldTrial(
       const std::string& trial_name,
       const std::vector<uint32_t>& group_name_hashes);
 
   // Calls
   // metrics::MetricsServiceAccessor::RegisterSyntheticFieldTrialWithNameHash()
   // with g_browser_process->metrics_service(). See that function's declaration
   // for details.
   static bool RegisterSyntheticFieldTrialWithNameHash(
       uint32_t trial_name_hash,
       const std::string& group_name);
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(ChromeMetricsServiceAccessor);
 };
 
 #endif  // CHROME_BROWSER_METRICS_CHROME_METRICS_SERVICE_ACCESSOR_H_