Disable-all-predictors-code.patch 13 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236237238239240241242243244245246247248249250251252253254255256
  1. From: uazo <uazo@users.noreply.github.com>
  2. Date: Tue, 25 Jan 2022 12:22:52 +0000
  3. Subject: Disable all predictors code
  4. ---
  5. .../chrome_hints_manager.cc | 1 +
  6. .../optimization_guide_keyed_service.cc | 1 -
  7. chrome/common/chrome_features.cc | 4 ++--
  8. .../optimization_guide/core/hints_fetcher.cc | 1 +
  9. .../optimization_guide/core/hints_manager.cc | 3 +++
  10. .../core/optimization_guide_features.cc | 20 +++++++++----------
  11. .../core/prediction_model_download_manager.cc | 4 +++-
  12. .../core/prediction_model_fetcher_impl.cc | 1 +
  13. components/optimization_guide/features.gni | 4 +---
  14. components/permissions/features.cc | 2 +-
  15. .../segmentation_platform/public/features.cc | 2 +-
  16. third_party/blink/common/features.cc | 2 +-
  17. 12 files changed, 25 insertions(+), 20 deletions(-)
  18. diff --git a/chrome/browser/optimization_guide/chrome_hints_manager.cc b/chrome/browser/optimization_guide/chrome_hints_manager.cc
  19. --- a/chrome/browser/optimization_guide/chrome_hints_manager.cc
  20. +++ b/chrome/browser/optimization_guide/chrome_hints_manager.cc
  21. @@ -29,6 +29,7 @@ bool IsAllowedToFetchForNavigationPrediction(
  22. const absl::optional<NavigationPredictorKeyedService::Prediction>
  23. prediction) {
  24. DCHECK(prediction);
  25. + if ((true)) return false;
  26. if (prediction->prediction_source() !=
  27. NavigationPredictorKeyedService::PredictionSource::
  28. diff --git a/chrome/browser/optimization_guide/optimization_guide_keyed_service.cc b/chrome/browser/optimization_guide/optimization_guide_keyed_service.cc
  29. --- a/chrome/browser/optimization_guide/optimization_guide_keyed_service.cc
  30. +++ b/chrome/browser/optimization_guide/optimization_guide_keyed_service.cc
  31. @@ -326,7 +326,6 @@ void OptimizationGuideKeyedService::RemoveObserverForOptimizationTargetModel(
  32. void OptimizationGuideKeyedService::RegisterOptimizationTypes(
  33. const std::vector<optimization_guide::proto::OptimizationType>&
  34. optimization_types) {
  35. - hints_manager_->RegisterOptimizationTypes(optimization_types);
  36. }
  37. optimization_guide::OptimizationGuideDecision
  38. diff --git a/chrome/common/chrome_features.cc b/chrome/common/chrome_features.cc
  39. --- a/chrome/common/chrome_features.cc
  40. +++ b/chrome/common/chrome_features.cc
  41. @@ -788,7 +788,7 @@ const base::Feature kPermissionAuditing{"PermissionAuditing",
  42. // Enables using the prediction service for permission prompts. We will keep
  43. // this feature in order to allow us to update the holdback chance via finch.
  44. const base::Feature kPermissionPredictions{"PermissionPredictions",
  45. - base::FEATURE_ENABLED_BY_DEFAULT};
  46. + base::FEATURE_DISABLED_BY_DEFAULT};
  47. // The holdback chance is 30% but it can also be configured/updated
  48. // through finch if needed.
  49. @@ -799,7 +799,7 @@ const base::FeatureParam<double> kPermissionPredictionsHoldbackChance(
  50. // Enables using the prediction service for geolocation permission prompts.
  51. const base::Feature kPermissionGeolocationPredictions{
  52. - "PermissionGeolocationPredictions", base::FEATURE_DISABLED_BY_DEFAULT};
  53. + "PermissionGeolocationPredictions", base::FEATURE_DISABLED_BY_DEFAULT}; // guard this
  54. const base::FeatureParam<double>
  55. kPermissionGeolocationPredictionsHoldbackChance(
  56. diff --git a/components/optimization_guide/core/hints_fetcher.cc b/components/optimization_guide/core/hints_fetcher.cc
  57. --- a/components/optimization_guide/core/hints_fetcher.cc
  58. +++ b/components/optimization_guide/core/hints_fetcher.cc
  59. @@ -175,6 +175,7 @@ bool HintsFetcher::FetchOptimizationGuideServiceHints(
  60. optimization_guide::proto::RequestContext request_context,
  61. const std::string& locale,
  62. HintsFetchedCallback hints_fetched_callback) {
  63. + if ((true)) return false;
  64. DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
  65. DCHECK_GT(optimization_types.size(), 0u);
  66. request_context_ = request_context;
  67. diff --git a/components/optimization_guide/core/hints_manager.cc b/components/optimization_guide/core/hints_manager.cc
  68. --- a/components/optimization_guide/core/hints_manager.cc
  69. +++ b/components/optimization_guide/core/hints_manager.cc
  70. @@ -1211,6 +1211,9 @@ OptimizationTypeDecision HintsManager::CanApplyOptimization(
  71. proto::OptimizationType optimization_type,
  72. OptimizationMetadata* optimization_metadata) {
  73. DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
  74. + if ((true)) {
  75. + return OptimizationTypeDecision::kNoHintAvailable;
  76. + }
  77. ScopedCanApplyOptimizationLogger scoped_logger(
  78. optimization_type, navigation_url, optimization_guide_logger_);
  79. diff --git a/components/optimization_guide/core/optimization_guide_features.cc b/components/optimization_guide/core/optimization_guide_features.cc
  80. --- a/components/optimization_guide/core/optimization_guide_features.cc
  81. +++ b/components/optimization_guide/core/optimization_guide_features.cc
  82. @@ -79,7 +79,7 @@ bool IsSupportedLocaleForFeature(const std::string locale,
  83. // Enables the syncing of the Optimization Hints component, which provides
  84. // hints for what optimizations can be applied on a page load.
  85. const base::Feature kOptimizationHints{"OptimizationHints",
  86. - base::FEATURE_ENABLED_BY_DEFAULT};
  87. + base::FEATURE_DISABLED_BY_DEFAULT};
  88. // Feature flag that contains a feature param that specifies the field trials
  89. // that are allowed to be sent up to the Optimization Guide Server.
  90. @@ -88,12 +88,12 @@ const base::Feature kOptimizationHintsFieldTrials{
  91. // Enables fetching from a remote Optimization Guide Service.
  92. const base::Feature kRemoteOptimizationGuideFetching{
  93. - "OptimizationHintsFetching", base::FEATURE_ENABLED_BY_DEFAULT};
  94. + "OptimizationHintsFetching", base::FEATURE_DISABLED_BY_DEFAULT}; // guard this
  95. const base::Feature kRemoteOptimizationGuideFetchingAnonymousDataConsent {
  96. "OptimizationHintsFetchingAnonymousDataConsent",
  97. #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_IOS)
  98. - base::FEATURE_ENABLED_BY_DEFAULT
  99. + base::FEATURE_DISABLED_BY_DEFAULT
  100. #else // !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_IOS)
  101. base::FEATURE_DISABLED_BY_DEFAULT
  102. #endif // BUILDFLAG(IS_ANDROID)
  103. @@ -107,15 +107,15 @@ const base::Feature kContextMenuPerformanceInfoAndRemoteHintFetching{
  104. // Enables the prediction of optimization targets.
  105. const base::Feature kOptimizationTargetPrediction{
  106. - "OptimizationTargetPrediction", base::FEATURE_ENABLED_BY_DEFAULT};
  107. + "OptimizationTargetPrediction", base::FEATURE_DISABLED_BY_DEFAULT}; // guard this
  108. // Enables the downloading of models.
  109. const base::Feature kOptimizationGuideModelDownloading {
  110. "OptimizationGuideModelDownloading",
  111. #if BUILDFLAG(BUILD_WITH_TFLITE_LIB)
  112. - base::FEATURE_ENABLED_BY_DEFAULT
  113. -#else // BUILD_WITH_TFLITE_LIB
  114. base::FEATURE_DISABLED_BY_DEFAULT
  115. +#else // BUILD_WITH_TFLITE_LIB
  116. + base::FEATURE_DISABLED_BY_DEFAULT // guard this
  117. #endif // !BUILD_WITH_TFLITE_LIB
  118. };
  119. @@ -141,7 +141,7 @@ const base::Feature kPageEntitiesModelResetOnShutdown{
  120. // Enables push notification of hints.
  121. const base::Feature kPushNotifications{"OptimizationGuidePushNotifications",
  122. - base::FEATURE_DISABLED_BY_DEFAULT};
  123. + base::FEATURE_DISABLED_BY_DEFAULT}; // guard this
  124. // This feature flag does not turn off any behavior, it is only used for
  125. // experiment parameters.
  126. @@ -153,12 +153,12 @@ const base::Feature kOptimizationGuideMetadataValidation{
  127. "OptimizationGuideMetadataValidation", base::FEATURE_DISABLED_BY_DEFAULT};
  128. const base::Feature kPageTopicsBatchAnnotations{
  129. - "PageTopicsBatchAnnotations", base::FEATURE_ENABLED_BY_DEFAULT};
  130. + "PageTopicsBatchAnnotations", base::FEATURE_DISABLED_BY_DEFAULT};
  131. const base::Feature kPageVisibilityBatchAnnotations{
  132. "PageVisibilityBatchAnnotations", base::FEATURE_ENABLED_BY_DEFAULT};
  133. const base::Feature kUseLocalPageEntitiesMetadataProvider{
  134. - "UseLocalPageEntitiesMetadataProvider", base::FEATURE_DISABLED_BY_DEFAULT};
  135. + "UseLocalPageEntitiesMetadataProvider", base::FEATURE_DISABLED_BY_DEFAULT}; // guard this
  136. const base::Feature kBatchAnnotationsValidation{
  137. "BatchAnnotationsValidation", base::FEATURE_DISABLED_BY_DEFAULT};
  138. @@ -389,7 +389,7 @@ size_t MaxURLKeyedHintCacheSize() {
  139. bool ShouldPersistHintsToDisk() {
  140. return GetFieldTrialParamByFeatureAsBool(kOptimizationHints,
  141. - "persist_hints_to_disk", true);
  142. + "persist_hints_to_disk", false);
  143. }
  144. bool ShouldOverrideOptimizationTargetDecisionForMetricsPurposes(
  145. diff --git a/components/optimization_guide/core/prediction_model_download_manager.cc b/components/optimization_guide/core/prediction_model_download_manager.cc
  146. --- a/components/optimization_guide/core/prediction_model_download_manager.cc
  147. +++ b/components/optimization_guide/core/prediction_model_download_manager.cc
  148. @@ -46,7 +46,7 @@ constexpr char kGoogApiKey[] = "X-Goog-Api-Key";
  149. // we require models to come from.
  150. constexpr uint8_t kPublisherKeyHash[] = {
  151. 0x66, 0xa1, 0xd9, 0x3e, 0x4e, 0x5a, 0x66, 0x8a, 0x0f, 0xd3, 0xfa,
  152. - 0xa3, 0x70, 0x71, 0x42, 0x16, 0x0d, 0x2d, 0x68, 0xb0, 0x53, 0x02,
  153. + 0x01, 0x02, 0x03, 0x04, 0x16, 0x0d, 0x2d, 0x68, 0xb0, 0x53, 0x02,
  154. 0x5c, 0x7f, 0xd0, 0x0c, 0xa1, 0x6e, 0xef, 0xdd, 0x63, 0x7a};
  155. const net::NetworkTrafficAnnotationTag
  156. kOptimizationGuidePredictionModelsTrafficAnnotation =
  157. @@ -106,6 +106,7 @@ PredictionModelDownloadManager::~PredictionModelDownloadManager() = default;
  158. void PredictionModelDownloadManager::StartDownload(
  159. const GURL& download_url,
  160. proto::OptimizationTarget optimization_target) {
  161. + if ((true)) return;
  162. download::DownloadParams download_params;
  163. download_params.client =
  164. download::DownloadClient::OPTIMIZATION_GUIDE_PREDICTION_MODELS;
  165. @@ -240,6 +241,7 @@ void PredictionModelDownloadManager::OnDownloadFailed(
  166. absl::optional<std::pair<base::FilePath, base::FilePath>>
  167. PredictionModelDownloadManager::ProcessDownload(
  168. const base::FilePath& file_path) {
  169. + if ((true)) return absl::nullopt;
  170. DCHECK(background_task_runner_->RunsTasksInCurrentSequence());
  171. if (!switches::ShouldSkipModelDownloadVerificationForTesting()) {
  172. diff --git a/components/optimization_guide/core/prediction_model_fetcher_impl.cc b/components/optimization_guide/core/prediction_model_fetcher_impl.cc
  173. --- a/components/optimization_guide/core/prediction_model_fetcher_impl.cc
  174. +++ b/components/optimization_guide/core/prediction_model_fetcher_impl.cc
  175. @@ -51,6 +51,7 @@ bool PredictionModelFetcherImpl::FetchOptimizationGuideServiceModels(
  176. proto::RequestContext request_context,
  177. const std::string& locale,
  178. ModelsFetchedCallback models_fetched_callback) {
  179. + if ((true)) return false;
  180. DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
  181. if (url_loader_)
  182. diff --git a/components/optimization_guide/features.gni b/components/optimization_guide/features.gni
  183. --- a/components/optimization_guide/features.gni
  184. +++ b/components/optimization_guide/features.gni
  185. @@ -10,9 +10,7 @@ if (is_android) {
  186. declare_args() {
  187. # This enables build with TFLite library.
  188. # Currently only available for Desktop and Android.
  189. - build_with_tflite_lib =
  190. - is_android || (is_win && target_cpu != "arm64") || is_linux || is_mac ||
  191. - is_chromeos || is_fuchsia || is_ios
  192. + build_with_tflite_lib = false
  193. # You can set the variable 'build_with_internal_optimization_guide' to true
  194. # even in a developer build in args.gn. Setting this variable explicitly to true will
  195. diff --git a/components/permissions/features.cc b/components/permissions/features.cc
  196. --- a/components/permissions/features.cc
  197. +++ b/components/permissions/features.cc
  198. @@ -69,7 +69,7 @@ const base::Feature kPermissionPredictionServiceUseUrlOverride{
  199. const base::Feature kPermissionOnDeviceNotificationPredictions{
  200. "PermissionOnDeviceNotificationPredictions",
  201. - base::FEATURE_DISABLED_BY_DEFAULT};
  202. + base::FEATURE_DISABLED_BY_DEFAULT}; // guard this
  203. #if BUILDFLAG(IS_ANDROID)
  204. diff --git a/components/segmentation_platform/public/features.cc b/components/segmentation_platform/public/features.cc
  205. --- a/components/segmentation_platform/public/features.cc
  206. +++ b/components/segmentation_platform/public/features.cc
  207. @@ -12,7 +12,7 @@ namespace features {
  208. const base::Feature kSegmentationPlatformFeature {
  209. "SegmentationPlatform",
  210. #if BUILDFLAG(IS_ANDROID)
  211. - base::FEATURE_ENABLED_BY_DEFAULT
  212. + base::FEATURE_DISABLED_BY_DEFAULT
  213. #else
  214. base::FEATURE_DISABLED_BY_DEFAULT
  215. #endif
  216. diff --git a/third_party/blink/common/features.cc b/third_party/blink/common/features.cc
  217. --- a/third_party/blink/common/features.cc
  218. +++ b/third_party/blink/common/features.cc
  219. @@ -180,7 +180,7 @@ const base::Feature kViewportHeightClientHintHeader{
  220. const base::Feature kNavigationPredictor {
  221. "NavigationPredictor",
  222. #if BUILDFLAG(IS_ANDROID)
  223. - base::FEATURE_ENABLED_BY_DEFAULT
  224. + base::FEATURE_DISABLED_BY_DEFAULT
  225. #else
  226. base::FEATURE_DISABLED_BY_DEFAULT
  227. #endif
  228. --
  229. 2.25.1