123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236237238239240241242243244245246247248249250251252253254255256257258259260261262263264265266267268269270271272273274275276277278279 |
- From: uazo <uazo@users.noreply.github.com>
- Date: Tue, 25 Jan 2022 12:22:52 +0000
- Subject: Disable all predictors code
- 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
- ---
- .../chrome_hints_manager.cc | 1 +
- .../optimization_guide_keyed_service.cc | 1 -
- chrome/common/chrome_features.cc | 6 ++---
- .../optimization_guide/core/hints_fetcher.cc | 1 +
- .../optimization_guide/core/hints_manager.cc | 4 ++++
- .../core/optimization_guide_features.cc | 24 +++++++++----------
- .../core/prediction_model_download_manager.cc | 6 +++--
- .../core/prediction_model_fetcher_impl.cc | 1 +
- components/optimization_guide/features.gni | 4 +---
- components/permissions/features.cc | 2 +-
- .../segmentation_platform/public/features.cc | 2 +-
- third_party/blink/common/features.cc | 2 +-
- 12 files changed, 30 insertions(+), 24 deletions(-)
- diff --git a/chrome/browser/optimization_guide/chrome_hints_manager.cc b/chrome/browser/optimization_guide/chrome_hints_manager.cc
- --- a/chrome/browser/optimization_guide/chrome_hints_manager.cc
- +++ b/chrome/browser/optimization_guide/chrome_hints_manager.cc
- @@ -29,6 +29,7 @@ bool IsAllowedToFetchForNavigationPrediction(
- const absl::optional<NavigationPredictorKeyedService::Prediction>
- prediction) {
- DCHECK(prediction);
- + if ((true)) return false;
-
- if (prediction->prediction_source() !=
- NavigationPredictorKeyedService::PredictionSource::
- diff --git a/chrome/browser/optimization_guide/optimization_guide_keyed_service.cc b/chrome/browser/optimization_guide/optimization_guide_keyed_service.cc
- --- a/chrome/browser/optimization_guide/optimization_guide_keyed_service.cc
- +++ b/chrome/browser/optimization_guide/optimization_guide_keyed_service.cc
- @@ -354,7 +354,6 @@ void OptimizationGuideKeyedService::RemoveObserverForOptimizationTargetModel(
- void OptimizationGuideKeyedService::RegisterOptimizationTypes(
- const std::vector<optimization_guide::proto::OptimizationType>&
- optimization_types) {
- - hints_manager_->RegisterOptimizationTypes(optimization_types);
- }
-
- optimization_guide::OptimizationGuideDecision
- diff --git a/chrome/common/chrome_features.cc b/chrome/common/chrome_features.cc
- --- a/chrome/common/chrome_features.cc
- +++ b/chrome/common/chrome_features.cc
- @@ -750,8 +750,8 @@ const base::Feature kPermissionAuditing{"PermissionAuditing",
-
- // Enables using the prediction service for permission prompts. We will keep
- // this feature in order to allow us to update the holdback chance via finch.
- -const base::Feature kPermissionPredictions{"PermissionPredictions",
- - base::FEATURE_ENABLED_BY_DEFAULT};
- +const base::Feature kPermissionPredictions{"PermissionPredictions", // always disabled
- + base::FEATURE_DISABLED_BY_DEFAULT}; // in Bromite
-
- // The holdback chance is 30% but it can also be configured/updated
- // through finch if needed.
- @@ -762,7 +762,7 @@ const base::FeatureParam<double> kPermissionPredictionsHoldbackChance(
-
- // Enables using the prediction service for geolocation permission prompts.
- const base::Feature kPermissionGeolocationPredictions{
- - "PermissionGeolocationPredictions", base::FEATURE_ENABLED_BY_DEFAULT};
- + "PermissionGeolocationPredictions", base::FEATURE_DISABLED_BY_DEFAULT}; // always disabled in Bromite
-
- const base::FeatureParam<double>
- kPermissionGeolocationPredictionsHoldbackChance(
- diff --git a/components/optimization_guide/core/hints_fetcher.cc b/components/optimization_guide/core/hints_fetcher.cc
- --- a/components/optimization_guide/core/hints_fetcher.cc
- +++ b/components/optimization_guide/core/hints_fetcher.cc
- @@ -175,6 +175,7 @@ bool HintsFetcher::FetchOptimizationGuideServiceHints(
- optimization_guide::proto::RequestContext request_context,
- const std::string& locale,
- HintsFetchedCallback hints_fetched_callback) {
- + if ((true)) return false;
- DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
- DCHECK_GT(optimization_types.size(), 0u);
- request_context_ = request_context;
- diff --git a/components/optimization_guide/core/hints_manager.cc b/components/optimization_guide/core/hints_manager.cc
- --- a/components/optimization_guide/core/hints_manager.cc
- +++ b/components/optimization_guide/core/hints_manager.cc
- @@ -348,6 +348,7 @@ void HintsManager::Shutdown() {
- OptimizationGuideDecision
- HintsManager::GetOptimizationGuideDecisionFromOptimizationTypeDecision(
- OptimizationTypeDecision optimization_type_decision) {
- + if ((true)) return OptimizationGuideDecision::kFalse;
- switch (optimization_type_decision) {
- case OptimizationTypeDecision::kAllowedByOptimizationFilter:
- case OptimizationTypeDecision::kAllowedByHint:
- @@ -1239,6 +1240,9 @@ OptimizationTypeDecision HintsManager::CanApplyOptimization(
- proto::OptimizationType optimization_type,
- OptimizationMetadata* optimization_metadata) {
- DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
- + if ((true)) {
- + return OptimizationTypeDecision::kNoHintAvailable;
- + }
-
- ScopedCanApplyOptimizationLogger scoped_logger(
- optimization_type, navigation_url, optimization_guide_logger_);
- diff --git a/components/optimization_guide/core/optimization_guide_features.cc b/components/optimization_guide/core/optimization_guide_features.cc
- --- a/components/optimization_guide/core/optimization_guide_features.cc
- +++ b/components/optimization_guide/core/optimization_guide_features.cc
- @@ -77,8 +77,8 @@ bool IsSupportedLocaleForFeature(const std::string locale,
-
- // Enables the syncing of the Optimization Hints component, which provides
- // hints for what optimizations can be applied on a page load.
- -const base::Feature kOptimizationHints{"OptimizationHints",
- - base::FEATURE_ENABLED_BY_DEFAULT};
- +const base::Feature kOptimizationHints{"OptimizationHints", // disabled by default
- + base::FEATURE_DISABLED_BY_DEFAULT}; // in Bromite
-
- // Feature flag that contains a feature param that specifies the field trials
- // that are allowed to be sent up to the Optimization Guide Server.
- @@ -87,11 +87,11 @@ const base::Feature kOptimizationHintsFieldTrials{
-
- // Enables fetching from a remote Optimization Guide Service.
- const base::Feature kRemoteOptimizationGuideFetching{
- - "OptimizationHintsFetching", base::FEATURE_ENABLED_BY_DEFAULT};
- + "OptimizationHintsFetching", base::FEATURE_DISABLED_BY_DEFAULT}; // disabled by default in Bromite
-
- const base::Feature kRemoteOptimizationGuideFetchingAnonymousDataConsent{
- - "OptimizationHintsFetchingAnonymousDataConsent",
- - base::FEATURE_ENABLED_BY_DEFAULT};
- + "OptimizationHintsFetchingAnonymousDataConsent", // disabled by default
- + base::FEATURE_DISABLED_BY_DEFAULT}; // in Bromite
-
- // Enables performance info in the context menu and fetching from a remote
- // Optimization Guide Service.
- @@ -101,15 +101,15 @@ const base::Feature kContextMenuPerformanceInfoAndRemoteHintFetching{
-
- // Enables the prediction of optimization targets.
- const base::Feature kOptimizationTargetPrediction{
- - "OptimizationTargetPrediction", base::FEATURE_ENABLED_BY_DEFAULT};
- + "OptimizationTargetPrediction", base::FEATURE_DISABLED_BY_DEFAULT}; // disabled by default in Bromite
-
- // Enables the downloading of models.
- const base::Feature kOptimizationGuideModelDownloading {
- "OptimizationGuideModelDownloading",
- #if BUILDFLAG(BUILD_WITH_TFLITE_LIB)
- - base::FEATURE_ENABLED_BY_DEFAULT
- -#else // BUILD_WITH_TFLITE_LIB
- base::FEATURE_DISABLED_BY_DEFAULT
- +#else // BUILD_WITH_TFLITE_LIB
- + base::FEATURE_DISABLED_BY_DEFAULT // guard this
- #endif // !BUILD_WITH_TFLITE_LIB
- };
-
- @@ -139,7 +139,7 @@ const base::Feature kPageEntitiesModelResetOnShutdown{
-
- // Enables push notification of hints.
- const base::Feature kPushNotifications{"OptimizationGuidePushNotifications",
- - base::FEATURE_DISABLED_BY_DEFAULT};
- + base::FEATURE_DISABLED_BY_DEFAULT}; // guard this
-
- // This feature flag does not turn off any behavior, it is only used for
- // experiment parameters.
- @@ -151,12 +151,12 @@ const base::Feature kOptimizationGuideMetadataValidation{
- "OptimizationGuideMetadataValidation", base::FEATURE_DISABLED_BY_DEFAULT};
-
- const base::Feature kPageTopicsBatchAnnotations{
- - "PageTopicsBatchAnnotations", base::FEATURE_ENABLED_BY_DEFAULT};
- + "PageTopicsBatchAnnotations", base::FEATURE_DISABLED_BY_DEFAULT};
- const base::Feature kPageVisibilityBatchAnnotations{
- "PageVisibilityBatchAnnotations", base::FEATURE_ENABLED_BY_DEFAULT};
-
- const base::Feature kUseLocalPageEntitiesMetadataProvider{
- - "UseLocalPageEntitiesMetadataProvider", base::FEATURE_DISABLED_BY_DEFAULT};
- + "UseLocalPageEntitiesMetadataProvider", base::FEATURE_DISABLED_BY_DEFAULT}; // guard this
-
- const base::Feature kPageContentAnnotationsValidation{
- "PageContentAnnotationsValidation", base::FEATURE_DISABLED_BY_DEFAULT};
- @@ -395,7 +395,7 @@ size_t MaxURLKeyedHintCacheSize() {
-
- bool ShouldPersistHintsToDisk() {
- return GetFieldTrialParamByFeatureAsBool(kOptimizationHints,
- - "persist_hints_to_disk", true);
- + "persist_hints_to_disk", false);
- }
-
- bool ShouldOverrideOptimizationTargetDecisionForMetricsPurposes(
- diff --git a/components/optimization_guide/core/prediction_model_download_manager.cc b/components/optimization_guide/core/prediction_model_download_manager.cc
- --- a/components/optimization_guide/core/prediction_model_download_manager.cc
- +++ b/components/optimization_guide/core/prediction_model_download_manager.cc
- @@ -46,7 +46,7 @@ constexpr char kGoogApiKey[] = "X-Goog-Api-Key";
- // we require models to come from.
- constexpr uint8_t kPublisherKeyHash[] = {
- 0x66, 0xa1, 0xd9, 0x3e, 0x4e, 0x5a, 0x66, 0x8a, 0x0f, 0xd3, 0xfa,
- - 0xa3, 0x70, 0x71, 0x42, 0x16, 0x0d, 0x2d, 0x68, 0xb0, 0x53, 0x02,
- + 0x01, 0x02, 0x03, 0x04, 0x16, 0x0d, 0x2d, 0x68, 0xb0, 0x53, 0x02,
- 0x5c, 0x7f, 0xd0, 0x0c, 0xa1, 0x6e, 0xef, 0xdd, 0x63, 0x7a};
- const net::NetworkTrafficAnnotationTag
- kOptimizationGuidePredictionModelsTrafficAnnotation =
- @@ -96,7 +96,7 @@ PredictionModelDownloadManager::PredictionModelDownloadManager(
- const base::FilePath& models_dir_path,
- scoped_refptr<base::SequencedTaskRunner> background_task_runner)
- : download_service_(download_service),
- - is_available_for_downloads_(true),
- + is_available_for_downloads_(false),
- api_key_(features::GetOptimizationGuideServiceAPIKey()),
- models_dir_path_(models_dir_path),
- background_task_runner_(background_task_runner) {}
- @@ -111,6 +111,7 @@ base::FilePath::StringType PredictionModelDownloadManager::ModelInfoFileName() {
- void PredictionModelDownloadManager::StartDownload(
- const GURL& download_url,
- proto::OptimizationTarget optimization_target) {
- + if ((true)) return;
- download::DownloadParams download_params;
- download_params.client =
- download::DownloadClient::OPTIMIZATION_GUIDE_PREDICTION_MODELS;
- @@ -247,6 +248,7 @@ void PredictionModelDownloadManager::OnDownloadFailed(
- absl::optional<std::pair<base::FilePath, base::FilePath>>
- PredictionModelDownloadManager::VerifyDownload(const base::FilePath& file_path,
- bool delete_file_on_error) {
- + if ((true)) return absl::nullopt;
- if (!switches::ShouldSkipModelDownloadVerificationForTesting()) {
- // Verify that the |file_path| contains a valid CRX file.
- std::string public_key;
- diff --git a/components/optimization_guide/core/prediction_model_fetcher_impl.cc b/components/optimization_guide/core/prediction_model_fetcher_impl.cc
- --- a/components/optimization_guide/core/prediction_model_fetcher_impl.cc
- +++ b/components/optimization_guide/core/prediction_model_fetcher_impl.cc
- @@ -51,6 +51,7 @@ bool PredictionModelFetcherImpl::FetchOptimizationGuideServiceModels(
- proto::RequestContext request_context,
- const std::string& locale,
- ModelsFetchedCallback models_fetched_callback) {
- + if ((true)) return false;
- DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
-
- if (url_loader_)
- diff --git a/components/optimization_guide/features.gni b/components/optimization_guide/features.gni
- --- a/components/optimization_guide/features.gni
- +++ b/components/optimization_guide/features.gni
- @@ -10,9 +10,7 @@ if (is_android) {
- declare_args() {
- # This enables build with TFLite library.
- # Currently only available for Desktop and Android.
- - build_with_tflite_lib =
- - is_android || (is_win && target_cpu != "arm64") || is_linux || is_mac ||
- - is_chromeos || is_fuchsia || is_ios
- + build_with_tflite_lib = false
-
- # You can set the variable 'build_with_internal_optimization_guide' to true
- # even in a developer build in args.gn. Setting this variable explicitly to true will
- diff --git a/components/permissions/features.cc b/components/permissions/features.cc
- --- a/components/permissions/features.cc
- +++ b/components/permissions/features.cc
- @@ -65,7 +65,7 @@ const base::Feature kPermissionPredictionServiceUseUrlOverride{
-
- const base::Feature kPermissionOnDeviceNotificationPredictions{
- "PermissionOnDeviceNotificationPredictions",
- - base::FEATURE_DISABLED_BY_DEFAULT};
- + base::FEATURE_DISABLED_BY_DEFAULT}; // guard this
-
- #if BUILDFLAG(IS_ANDROID)
-
- 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
- @@ -27,7 +27,7 @@ const base::Feature kSegmentationPlatformLowEngagementFeature{
- const base::Feature kSegmentationPlatformFeedSegmentFeature{
- "SegmentationPlatformFeedSegmentFeature",
- #if BUILDFLAG(IS_ANDROID)
- - base::FEATURE_ENABLED_BY_DEFAULT
- + base::FEATURE_DISABLED_BY_DEFAULT
- };
- #else
- base::FEATURE_DISABLED_BY_DEFAULT
- diff --git a/third_party/blink/common/features.cc b/third_party/blink/common/features.cc
- --- a/third_party/blink/common/features.cc
- +++ b/third_party/blink/common/features.cc
- @@ -180,7 +180,7 @@ const base::Feature kViewportHeightClientHintHeader{
- const base::Feature kNavigationPredictor {
- "NavigationPredictor",
- #if BUILDFLAG(IS_ANDROID)
- - base::FEATURE_ENABLED_BY_DEFAULT
- + base::FEATURE_DISABLED_BY_DEFAULT
- #else
- base::FEATURE_DISABLED_BY_DEFAULT
- #endif
- --
- 2.25.1
|