diff --git a/chromium_src/chrome/browser/metrics/chrome_metrics_services_manager_client.cc b/chromium_src/chrome/browser/metrics/chrome_metrics_services_manager_client.cc new file mode 100644 index 00000000000..5b57d6e675d --- /dev/null +++ b/chromium_src/chrome/browser/metrics/chrome_metrics_services_manager_client.cc @@ -0,0 +1,14 @@ +/* Copyright (c) 2020 The Brave Authors. All rights reserved. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this file, + * you can obtain one at http://mozilla.org/MPL/2.0/. */ + +#include "chrome/browser/metrics/chrome_metrics_services_manager_client.h" + +#define IsMetricsReportingEnabled IsMetricsReportingEnabled_ChromiumImpl +#include "../../../../../chrome/browser/metrics/chrome_metrics_services_manager_client.cc" +#undef IsMetricsReportingEnabled + +bool ChromeMetricsServicesManagerClient::IsMetricsReportingEnabled() { + return false; +} diff --git a/chromium_src/chrome/browser/metrics/chrome_metrics_services_manager_client.h b/chromium_src/chrome/browser/metrics/chrome_metrics_services_manager_client.h new file mode 100644 index 00000000000..6cdb2192317 --- /dev/null +++ b/chromium_src/chrome/browser/metrics/chrome_metrics_services_manager_client.h @@ -0,0 +1,16 @@ +/* Copyright (c) 2020 The Brave Authors. All rights reserved. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this file, + * you can obtain one at http://mozilla.org/MPL/2.0/. */ + +#ifndef BRAVE_CHROMIUM_SRC_CHROME_BROWSER_METRICS_CHROME_METRICS_SERVICES_MANAGER_CLIENT_H_ +#define BRAVE_CHROMIUM_SRC_CHROME_BROWSER_METRICS_CHROME_METRICS_SERVICES_MANAGER_CLIENT_H_ + +#include "components/metrics_services_manager/metrics_services_manager_client.h" + +#define IsMetricsReportingEnabled IsMetricsReportingEnabled_ChromiumImpl(); \ + virtual bool IsMetricsReportingEnabled +#include "../../../../../chrome/browser/metrics/chrome_metrics_services_manager_client.h" +#undef IsMetricsReportingEnabled + +#endif // BRAVE_CHROMIUM_SRC_CHROME_BROWSER_METRICS_CHROME_METRICS_SERVICES_MANAGER_CLIENT_H_ diff --git a/patches/chrome-browser-metrics-chrome_metrics_services_manager_client.cc.patch b/patches/chrome-browser-metrics-chrome_metrics_services_manager_client.cc.patch deleted file mode 100644 index c0b8e7746b1..00000000000 --- a/patches/chrome-browser-metrics-chrome_metrics_services_manager_client.cc.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/chrome/browser/metrics/chrome_metrics_services_manager_client.cc b/chrome/browser/metrics/chrome_metrics_services_manager_client.cc -index 5bc58e3dd54dfc76b5789792ad8e958fc5043ab1..3ad736794d9edb979fe2f120b5fed055fb3a3c13 100644 ---- a/chrome/browser/metrics/chrome_metrics_services_manager_client.cc -+++ b/chrome/browser/metrics/chrome_metrics_services_manager_client.cc -@@ -154,7 +154,7 @@ class ChromeMetricsServicesManagerClient::ChromeEnabledStateProvider - } - - bool IsReportingEnabled() const override { -- return metrics::EnabledStateProvider::IsReportingEnabled() && -+ return false && metrics::EnabledStateProvider::IsReportingEnabled() && - IsClientInSampleImpl(local_state_); - } -