BASELINE: Update Chromium to 85.0.4183.14085-based

Change-Id: Iaa42f4680837c57725b1344f108c0196741f6057
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>

2 files changed, 23 insertions, 4 deletions

diff --git a/chromium/components/optimization_guide/proto/hints.proto b/chromium/components/optimization_guide/proto/hints.proto
index a17704598e9..b0c73b844dc 100644
--- a/chromium/components/optimization_guide/proto/hints.proto
+++ b/chromium/components/optimization_guide/proto/hints.proto
@@ -136,6 +136,9 @@ enum OptimizationType {
   // This optimization provides the Loading Predictor with resources predicted
   // to be on the page.
   LOADING_PREDICTOR = 9;
+  // This optimization provides information about hosts that historically
+  // provide a fast and responsive user experience.
+  FAST_HOST_HINTS = 10;
 }
 
 // Presents semantics for how page load URLs should be matched.
@@ -247,9 +250,7 @@ message BloomFilter {
   optional bytes data = 3;
 }
 
-// A scalable filter for an optimization type. Initially, this is used to
-// provide a large scale blacklist but might be used for whitelists in
-// the future.
+// A scalable filter for an optimization type.
 message OptimizationFilter {
   // The type of optimization this filter applies to.
   optional OptimizationType optimization_type = 1;
@@ -258,6 +259,9 @@ message OptimizationFilter {
   // Additional filters represented as regexps matched against the main page
   // URL.
   repeated string regexps = 3;
+  // Whether additional host suffixes (other than the host) should be checked
+  // against the filter.
+  optional bool skip_host_suffix_checking = 4;
 }
 
 message Configuration {
@@ -277,8 +281,16 @@ message Configuration {
   // details for that key that it wants to provide as the client will only
   // look at that one record to decide which optimization to apply.
   repeated Hint hints = 1;
-  // A list of per-optimization blacklists.
+  // A set of per-optimization blacklists.
+  //
+  // It is guaranteed that an optimization type will not have filters in both
+  // |optimization_blacklists| and |optimization_allowlists|.
   repeated OptimizationFilter optimization_blacklists = 2;
+  // A set of per-optimization allowlists.
+  //
+  // It is guaranteed that an optimization type will not have filters in both
+  // |optimization_blacklists| and |optimization_allowlists|.
+  repeated OptimizationFilter optimization_allowlists = 3;
 }
 
 message Timestamp {
diff --git a/chromium/components/optimization_guide/proto/performance_hints_metadata.proto b/chromium/components/optimization_guide/proto/performance_hints_metadata.proto
index 9232d88f1a3..871fb138a1d 100644
--- a/chromium/components/optimization_guide/proto/performance_hints_metadata.proto
+++ b/chromium/components/optimization_guide/proto/performance_hints_metadata.proto
@@ -43,4 +43,11 @@ message PerformanceHintsMetadata {
   //
   // Only the first matching hint should be applied to a given URL.
   repeated PerformanceHint performance_hints = 1;
+
+  // The PerformanceHint for the page pattern that matched the parent
+  // OptimizationGuide hint.
+  //
+  // This is (generally) the current page. The "key" field is not populated as
+  // the pattern matching is done by OptimizationGuide.
+  optional PerformanceHint page_hint = 2;
 }