| Index: chrome/browser/metrics/chrome_metrics_services_manager_client.cc
|
| diff --git a/chrome/browser/metrics/chrome_metrics_services_manager_client.cc b/chrome/browser/metrics/chrome_metrics_services_manager_client.cc
|
| index d7ef150b474e5cc1415e73545a41ac7d952bec63..ded25a2282cd3f46320b2b29e49004f0de7050b6 100644
|
| --- a/chrome/browser/metrics/chrome_metrics_services_manager_client.cc
|
| +++ b/chrome/browser/metrics/chrome_metrics_services_manager_client.cc
|
| @@ -5,6 +5,7 @@
|
| #include "chrome/browser/metrics/chrome_metrics_services_manager_client.h"
|
|
|
| #include "base/command_line.h"
|
| +#include "base/feature_list.h"
|
| #include "base/logging.h"
|
| #include "base/memory/ptr_util.h"
|
| #include "chrome/browser/browser_process.h"
|
| @@ -34,6 +35,9 @@ void PostStoreMetricsClientInfo(const metrics::ClientInfo& client_info) {
|
|
|
| } // namespace
|
|
|
| +const base::Feature kMetricsReportingFeature{"MetricsReporting",
|
| + base::FEATURE_ENABLED_BY_DEFAULT};
|
| +
|
| class ChromeMetricsServicesManagerClient::ChromeEnabledStateProvider
|
| : public metrics::EnabledStateProvider {
|
| public:
|
| @@ -44,6 +48,11 @@ class ChromeMetricsServicesManagerClient::ChromeEnabledStateProvider
|
| return ChromeMetricsServiceAccessor::IsMetricsAndCrashReportingEnabled();
|
| }
|
|
|
| + bool IsReportingEnabled() override {
|
| + return IsConsentGiven() &&
|
| + base::FeatureList::IsEnabled(kMetricsReportingFeature);
|
| + }
|
| +
|
| DISALLOW_COPY_AND_ASSIGN(ChromeEnabledStateProvider);
|
| };
|
|
|
|
|