90 lines
4.3 KiB
Diff
90 lines
4.3 KiB
Diff
From: csagan5 <32685696+csagan5@users.noreply.github.com>
|
|
Date: Wed, 16 Feb 2022 11:32:33 +0100
|
|
Subject: Disable various metrics
|
|
|
|
Including initial metrics opt-out
|
|
---
|
|
.../browser/firstrun/FirstRunActivityBase.java | 2 +-
|
|
chrome/browser/chrome_content_browser_client.cc | 15 ---------------
|
|
.../chrome_metrics_services_manager_client.cc | 2 +-
|
|
services/metrics/public/cpp/ukm_recorder.cc | 2 +-
|
|
4 files changed, 3 insertions(+), 18 deletions(-)
|
|
|
|
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunActivityBase.java b/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunActivityBase.java
|
|
--- a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunActivityBase.java
|
|
+++ b/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunActivityBase.java
|
|
@@ -45,7 +45,7 @@ public abstract class FirstRunActivityBase extends AsyncInitializationActivity {
|
|
|
|
static final String OPEN_ADVANCED_SYNC_SETTINGS = "OpenAdvancedSyncSettings";
|
|
|
|
- public static final boolean DEFAULT_METRICS_AND_CRASH_REPORTING = true;
|
|
+ public static final boolean DEFAULT_METRICS_AND_CRASH_REPORTING = false;
|
|
|
|
private boolean mNativeInitialized;
|
|
|
|
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
|
|
--- a/chrome/browser/chrome_content_browser_client.cc
|
|
+++ b/chrome/browser/chrome_content_browser_client.cc
|
|
@@ -59,7 +59,6 @@
|
|
#include "chrome/browser/hid/chrome_hid_delegate.h"
|
|
#include "chrome/browser/interstitials/enterprise_util.h"
|
|
#include "chrome/browser/lifetime/browser_shutdown.h"
|
|
-#include "chrome/browser/lookalikes/lookalike_url_navigation_throttle.h"
|
|
#include "chrome/browser/media/audio_service_util.h"
|
|
#include "chrome/browser/media/router/media_router_feature.h"
|
|
#include "chrome/browser/media/webrtc/audio_debug_recordings_handler.h"
|
|
@@ -4135,16 +4134,6 @@ ChromeContentBrowserClient::CreateThrottlesForNavigation(
|
|
content::NavigationHandle* handle) {
|
|
std::vector<std::unique_ptr<content::NavigationThrottle>> throttles;
|
|
|
|
- // MetricsNavigationThrottle requires that it runs before NavigationThrottles
|
|
- // that may delay or cancel navigations, so only NavigationThrottles that
|
|
- // don't delay or cancel navigations (e.g. throttles that are only observing
|
|
- // callbacks without affecting navigation behavior) should be added before
|
|
- // MetricsNavigationThrottle.
|
|
- if (handle->IsInMainFrame()) {
|
|
- throttles.push_back(
|
|
- page_load_metrics::MetricsNavigationThrottle::Create(handle));
|
|
- }
|
|
-
|
|
if (handle->IsInMainFrame()) {
|
|
MaybeAddThrottle(url_param_filter::CrossOtrMetricNavigationThrottle::
|
|
MaybeCreateThrottleFor(handle),
|
|
@@ -4243,10 +4232,6 @@ ChromeContentBrowserClient::CreateThrottlesForNavigation(
|
|
throttle_manager->MaybeAppendNavigationThrottles(handle, &throttles);
|
|
}
|
|
|
|
- MaybeAddThrottle(
|
|
- LookalikeUrlNavigationThrottle::MaybeCreateNavigationThrottle(handle),
|
|
- &throttles);
|
|
-
|
|
MaybeAddThrottle(PDFIFrameNavigationThrottle::MaybeCreateThrottleFor(handle),
|
|
&throttles);
|
|
#if BUILDFLAG(ENABLE_PDF)
|
|
diff --git a/chrome/browser/metrics/chrome_metrics_services_manager_client.cc b/chrome/browser/metrics/chrome_metrics_services_manager_client.cc
|
|
--- a/chrome/browser/metrics/chrome_metrics_services_manager_client.cc
|
|
+++ b/chrome/browser/metrics/chrome_metrics_services_manager_client.cc
|
|
@@ -75,7 +75,7 @@ namespace internal {
|
|
// recording and reporting are enabled. If the feature is enabled, but no
|
|
// consent is given, then there will be no recording or reporting.
|
|
const base::Feature kMetricsReportingFeature{"MetricsReporting",
|
|
- base::FEATURE_ENABLED_BY_DEFAULT};
|
|
+ base::FEATURE_DISABLED_BY_DEFAULT};
|
|
|
|
} // namespace internal
|
|
} // namespace metrics
|
|
diff --git a/services/metrics/public/cpp/ukm_recorder.cc b/services/metrics/public/cpp/ukm_recorder.cc
|
|
--- a/services/metrics/public/cpp/ukm_recorder.cc
|
|
+++ b/services/metrics/public/cpp/ukm_recorder.cc
|
|
@@ -13,7 +13,7 @@
|
|
|
|
namespace ukm {
|
|
|
|
-const base::Feature kUkmFeature = {"Ukm", base::FEATURE_ENABLED_BY_DEFAULT};
|
|
+const base::Feature kUkmFeature = {"Ukm", base::FEATURE_DISABLED_BY_DEFAULT}; // disabled in Bromite
|
|
|
|
UkmRecorder::UkmRecorder() = default;
|
|
|
|
--
|
|
2.25.1
|