Merge pull request #6948 from brave/gyuyoung-remove-chrome-metric-patch

Remove chrome-browser-metrics-chrome_metrics_services_manager_client.cc.patch
2020-11-07 16:34:08 +09:00
parent 47952d3eba f1c2dce00f
commit fc111efbb1
3 changed files with 30 additions and 13 deletions
@@ -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;
+}
@@ -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_
@@ -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_);
-   }
-