From: uazo Date: Thu, 9 Jun 2022 19:45:03 +0000 Subject: Remove segmentation platform Also fixes a crash on startup. Original License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html --- ...rome_browser_main_extra_parts_segmentation_platform.cc | 4 ++++ components/segmentation_platform/public/features.cc | 8 ++------ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/chrome/browser/segmentation_platform/chrome_browser_main_extra_parts_segmentation_platform.cc b/chrome/browser/segmentation_platform/chrome_browser_main_extra_parts_segmentation_platform.cc --- a/chrome/browser/segmentation_platform/chrome_browser_main_extra_parts_segmentation_platform.cc +++ b/chrome/browser/segmentation_platform/chrome_browser_main_extra_parts_segmentation_platform.cc @@ -12,17 +12,20 @@ #include "components/segmentation_platform/public/segmentation_platform_service.h" void ChromeBrowserMainExtraPartsSegmentationPlatform::PreCreateThreads() { + if ((true)) return; segmentation_platform::LocalStateHelper::GetInstance().Initialize( g_browser_process->local_state()); } void ChromeBrowserMainExtraPartsSegmentationPlatform::PreProfileInit() { + if ((true)) return; segmentation_platform::UkmDatabaseClient::GetInstance().PreProfileInit(); } void ChromeBrowserMainExtraPartsSegmentationPlatform::PostProfileInit( Profile* profile, bool is_initial_profile) { + if ((true)) return; if (!profile || profile->IsOffTheRecord()) return; @@ -34,5 +37,6 @@ void ChromeBrowserMainExtraPartsSegmentationPlatform::PostProfileInit( } void ChromeBrowserMainExtraPartsSegmentationPlatform::PostMainMessageLoopRun() { + if ((true)) return; segmentation_platform::UkmDatabaseClient::GetInstance().PostMessageLoopRun(); } diff --git a/components/segmentation_platform/public/features.cc b/components/segmentation_platform/public/features.cc --- a/components/segmentation_platform/public/features.cc +++ b/components/segmentation_platform/public/features.cc @@ -9,8 +9,8 @@ namespace segmentation_platform::features { BASE_FEATURE(kSegmentationPlatformFeature, - "SegmentationPlatform", - base::FEATURE_ENABLED_BY_DEFAULT); + "SegmentationPlatform", // disabled by default + base::FEATURE_DISABLED_BY_DEFAULT); // in Bromite BASE_FEATURE(kSegmentationPlatformUkmEngine, "SegmentationPlatformUkmEngine", @@ -42,11 +42,7 @@ BASE_FEATURE(kSegmentationPlatformDeviceSwitcher, BASE_FEATURE(kSegmentationPlatformFeedSegmentFeature, "SegmentationPlatformFeedSegmentFeature", -#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_IOS) - base::FEATURE_ENABLED_BY_DEFAULT); -#else base::FEATURE_DISABLED_BY_DEFAULT); -#endif BASE_FEATURE(kResumeHeavyUserSegmentFeature, "ResumeHeavyUserSegment", -- 2.25.1