v109 no code changes (with fix some lost changes after v108)

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              |  8 ++--

 .../optimization_guide/core/hints_fetcher.cc  |  1 +

 .../optimization_guide/core/hints_manager.cc  |  5 +++

 components/optimization_guide/features.gni    |  4 +-

 components/permissions/features.cc            |  8 ++--

 third_party/blink/common/features.cc          |  8 +---

 10 files changed, 40 insertions(+), 40 deletions(-)

 11 files changed, 40 insertions(+), 41 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

   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

@@ -318,7 +318,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

@@ -883,8 +883,8 @@ BASE_FEATURE(kPermissionAuditing,

@@ -889,8 +889,8 @@ BASE_FEATURE(kPermissionAuditing,

 // 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.

 BASE_FEATURE(kPermissionPredictions,

 // The holdback chance is 30% but it can also be configured/updated

 // through finch if needed.

@@ -895,8 +895,8 @@ const base::FeatureParam<double> kPermissionPredictionsHoldbackChance(

@@ -901,8 +901,8 @@ const base::FeatureParam<double> kPermissionPredictionsHoldbackChance(

 // Enables using the prediction service for geolocation permission prompts.

 BASE_FEATURE(kPermissionGeolocationPredictions,

 BASE_FEATURE(kPageContentAnnotationsValidation,

              "PageContentAnnotationsValidation",

@@ -408,7 +404,7 @@ size_t MaxURLKeyedHintCacheSize() {

@@ -414,7 +410,7 @@ size_t MaxURLKeyedHintCacheSize() {

 bool ShouldPersistHintsToDisk() {

   return GetFieldTrialParamByFeatureAsBool(kOptimizationHints,

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";

@@ -45,7 +45,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,

     0x5c, 0x7f, 0xd0, 0x0c, 0xa1, 0x6e, 0xef, 0xdd, 0x63, 0x7a};

 const net::NetworkTrafficAnnotationTag

     kOptimizationGuidePredictionModelsTrafficAnnotation =

@@ -99,7 +99,7 @@ PredictionModelDownloadManager::PredictionModelDownloadManager(

@@ -93,7 +93,7 @@ PredictionModelDownloadManager::PredictionModelDownloadManager(

     const base::FilePath& models_dir_path,

     scoped_refptr<base::SequencedTaskRunner> background_task_runner)

     : download_service_(download_service),

       api_key_(features::GetOptimizationGuideServiceAPIKey()),

       models_dir_path_(models_dir_path),

       background_task_runner_(background_task_runner) {}

@@ -114,6 +114,7 @@ base::FilePath::StringType PredictionModelDownloadManager::ModelInfoFileName() {

@@ -103,6 +103,7 @@ PredictionModelDownloadManager::~PredictionModelDownloadManager() = default;

 void PredictionModelDownloadManager::StartDownload(

     const GURL& download_url,

     proto::OptimizationTarget optimization_target) {

   download::DownloadParams download_params;

   download_params.client =

       download::DownloadClient::OPTIMIZATION_GUIDE_PREDICTION_MODELS;

@@ -250,6 +251,7 @@ void PredictionModelDownloadManager::OnDownloadFailed(

@@ -239,6 +240,7 @@ void PredictionModelDownloadManager::OnDownloadFailed(

 absl::optional<std::pair<base::FilePath, base::FilePath>>

 PredictionModelDownloadManager::VerifyDownload(const base::FilePath& file_path,

                                                bool delete_file_on_error) {

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

@@ -214,12 +214,8 @@ BASE_FEATURE(kMixedContentAutoupgrade,

@@ -230,12 +230,8 @@ BASE_FEATURE(kMixedContentAutoupgrade,

 // predictor may preconnect/prefetch to resources/origins to make the

 // future navigations faster.

 BASE_FEATURE(kNavigationPredictor,

 .../render_view_context_menu_base.cc              |  3 ---

 .../aggregatable_report_sender.cc                 | 15 +++++++--------

 .../attribution_reporting/attribution_host.cc     |  1 +

 .../attribution_report_network_sender.cc          | 15 ++++++++-------

 .../attribution_report_network_sender.cc          | 11 ++++++++---

 .../attribution_storage_sql.cc                    |  8 +++++---

 content/browser/storage_partition_impl.cc         |  7 +------

 content/public/browser/navigation_controller.cc   |  1 -

 third_party/blink/common/features.cc              |  4 ++--

 .../platform/runtime_enabled_features.json5       |  7 +++++++

 10 files changed, 32 insertions(+), 33 deletions(-)

 11 files changed, 37 insertions(+), 32 deletions(-)

diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browser/flags/android/chrome_feature_list.cc

--- a/chrome/browser/flags/android/chrome_feature_list.cc

+++ b/chrome/browser/flags/android/chrome_feature_list.cc

@@ -521,8 +521,8 @@ BASE_FEATURE(kAppMenuMobileSiteOption,

@@ -522,8 +522,8 @@ BASE_FEATURE(kAppMenuMobileSiteOption,

              base::FEATURE_DISABLED_BY_DEFAULT);

 BASE_FEATURE(kAppToWebAttribution,

diff --git a/content/browser/attribution_reporting/attribution_host.cc b/content/browser/attribution_reporting/attribution_host.cc

--- a/content/browser/attribution_reporting/attribution_host.cc

+++ b/content/browser/attribution_reporting/attribution_host.cc

@@ -124,6 +124,7 @@ void AttributionHost::DidRedirectNavigation(

@@ -126,6 +126,7 @@ void AttributionHost::DidRedirectNavigation(

     return;

   }

diff --git a/content/browser/attribution_reporting/attribution_report_network_sender.cc b/content/browser/attribution_reporting/attribution_report_network_sender.cc

--- a/content/browser/attribution_reporting/attribution_report_network_sender.cc

+++ b/content/browser/attribution_reporting/attribution_report_network_sender.cc

@@ -110,13 +110,8 @@ void AttributionReportNetworkSender::SendReport(

@@ -132,9 +132,8 @@ void AttributionReportNetworkSender::SendReport(GURL url,

                    network::SimpleURLLoader::RETRY_ON_NAME_NOT_RESOLVED;

   simple_url_loader_ptr->SetRetryOptions(/*max_retries=*/1, retry_mode);

-  // Unretained is safe because the URLLoader is owned by |this| and will be

-  // deleted before |this|.

-  simple_url_loader_ptr->DownloadHeadersOnly(

-      url_loader_factory_.get(),

-      base::BindOnce(&AttributionReportNetworkSender::OnReportSent,

-                     base::Unretained(this), std::move(it), std::move(report),

-                     is_debug_report, std::move(sent_callback)));

-      base::BindOnce(std::move(callback), std::move(it)));

+  // this is never called on Bromite but nothing would be sent if it were

+  OnReportSent(std::move(it), report, is_debug_report, std::move(sent_callback), nullptr);

 }

 void AttributionReportNetworkSender::OnReportSent(

@@ -125,6 +120,12 @@ void AttributionReportNetworkSender::OnReportSent(

     bool is_debug_report,

@@ -143,6 +142,12 @@ void AttributionReportNetworkSender::OnReportSent(

     ReportSentCallback sent_callback,

     UrlLoaderList::iterator it,

     scoped_refptr<net::HttpResponseHeaders> headers) {

+  if ((true)) {

+    std::move(sent_callback)

   network::SimpleURLLoader* loader = it->get();

   // Consider a non-200 HTTP code as a non-internal error.

diff --git a/content/browser/attribution_reporting/attribution_storage_sql.cc b/content/browser/attribution_reporting/attribution_storage_sql.cc

--- a/content/browser/attribution_reporting/attribution_storage_sql.cc

+++ b/content/browser/attribution_reporting/attribution_storage_sql.cc

@@ -514,6 +514,8 @@ DestinationLimitResult GetDestinationLimitResult(

   }

 }

+bool g_run_in_memory = true;

+

 }  // namespace

 // static

@@ -525,9 +527,9 @@ bool AttributionStorageSql::DeleteStorageForTesting(

 AttributionStorageSql::AttributionStorageSql(

     const base::FilePath& user_data_directory,

     std::unique_ptr<AttributionStorageDelegate> delegate)

-    : path_to_database_(user_data_directory.empty()

-                            ? base::FilePath()

-                            : DatabasePath(user_data_directory)),

+    : path_to_database_(user_data_directory.empty() || g_run_in_memory

+                             ? base::FilePath()

+                             : DatabasePath(user_data_directory)),

       delegate_(std::move(delegate)),

       rate_limit_table_(delegate_.get()) {

   DCHECK(delegate_);

diff --git a/content/browser/storage_partition_impl.cc b/content/browser/storage_partition_impl.cc

--- a/content/browser/storage_partition_impl.cc

+++ b/content/browser/storage_partition_impl.cc

@@ -1353,12 +1353,7 @@ void StoragePartitionImpl::Initialize(

@@ -1358,12 +1358,7 @@ void StoragePartitionImpl::Initialize(

   bucket_manager_ = std::make_unique<BucketManager>(this);

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

@@ -105,8 +105,8 @@ BASE_FEATURE(kBlockingDownloadsInAdFrameWithoutUserActivation,

@@ -121,8 +121,8 @@ BASE_FEATURE(kBlockingDownloadsInAdFrameWithoutUserActivation,

 // Controls whether the Conversion Measurement API infrastructure is enabled.

 BASE_FEATURE(kConversionMeasurement,

diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 b/third_party/blink/renderer/platform/runtime_enabled_features.json5

--- a/third_party/blink/renderer/platform/runtime_enabled_features.json5

+++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5

@@ -176,6 +176,13 @@

@@ -201,6 +201,13 @@

   },

   data: [

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_browser_main_extra_parts_segmentation_platform.cc  | 4 ++++

 components/segmentation_platform/public/features.cc           | 4 ----

 2 files changed, 4 insertions(+), 4 deletions(-)

 ...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

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(kSegmentationStructuredMetricsFeature,

              "SegmentationStructuredMetrics",

@@ -34,11 +34,7 @@ BASE_FEATURE(kSegmentationPlatformSearchUser,

 BASE_FEATURE(kSegmentationPlatformFeedSegmentFeature,