Update to Chromium 94.0.4606.54

chromium_version.txt

@@ -1 +1 @@
-93.0.4577.82
+94.0.4606.54

flags.gn

@@ -1,6 +1,7 @@
 build_with_tflite_lib=false
 chrome_pgo_phase=0
 clang_use_chrome_plugins=false
+disable_fieldtrial_testing_config=true
 enable_hangout_services_extension=false
 enable_js_type_check=false
 enable_mdns=false
@@ -14,7 +15,6 @@ enable_reporting=false
 enable_service_discovery=false
 enable_widevine=true
 exclude_unwind_tables=true
-fieldtrial_testing_like_official_build=true
 google_api_key=""
 google_default_client_id=""
 google_default_client_secret=""

patches/core/bromite/disable-fetching-field-trials.patch

@@ -10,7 +10,7 @@ Subject: Disable fetching of all field trials
 
 --- a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
 +++ b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
-@@ -123,11 +123,7 @@ public abstract class ChromeFeatureList 
+@@ -123,11 +123,7 @@ public abstract class ChromeFeatureList
       *   the specified parameter does not exist.
       */
      public static String getFieldTrialParamByFeature(String featureName, String paramName) {
@@ -23,7 +23,7 @@ Subject: Disable fetching of all field trials
      }
 
      /**
-@@ -144,12 +140,7 @@ public abstract class ChromeFeatureList 
+@@ -144,12 +140,7 @@ public abstract class ChromeFeatureList
       */
      public static int getFieldTrialParamByFeatureAsInt(
              String featureName, String paramName, int defaultValue) {
@@ -37,7 +37,7 @@ Subject: Disable fetching of all field trials
      }
 
      /**
-@@ -166,12 +157,7 @@ public abstract class ChromeFeatureList 
+@@ -166,12 +157,7 @@ public abstract class ChromeFeatureList
       */
      public static double getFieldTrialParamByFeatureAsDouble(
              String featureName, String paramName, double defaultValue) {
@@ -51,7 +51,7 @@ Subject: Disable fetching of all field trials
      }
 
      /**
-@@ -202,12 +188,7 @@ public abstract class ChromeFeatureList 
+@@ -202,12 +188,7 @@ public abstract class ChromeFeatureList
       */
      public static boolean getFieldTrialParamByFeatureAsBoolean(
              String featureName, String paramName, boolean defaultValue) {

patches/core/chromium-upstream/missing-header-without-tflite.patch

@@ -0,0 +1,22 @@
+From d7b0aa0df41d24fc1875a8d87c9298eb9098cf09 Mon Sep 17 00:00:00 2001
+From: Robert Ogden <robertogden@chromium.org>
+Date: Mon, 13 Sep 2021 19:23:58 +0000
+Subject: [PATCH] Missing header when TFLite isn't built in
+
+Change-Id: I4e89f7b8f2d67343e219a1935dbdcb64682a5df9
+Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3158501
+Auto-Submit: Robert Ogden <robertogden@chromium.org>
+Commit-Queue: Michael Crouse <mcrouse@chromium.org>
+Reviewed-by: Michael Crouse <mcrouse@chromium.org>
+Cr-Commit-Position: refs/heads/main@{#920867}
+
+--- a/components/optimization_guide/content/browser/page_content_annotations_service.cc
++++ b/components/optimization_guide/content/browser/page_content_annotations_service.cc
+@@ -6,6 +6,7 @@
+
+ #include "base/metrics/histogram_functions.h"
+ #include "base/strings/string_util.h"
++#include "base/strings/utf_string_conversions.h"
+ #include "components/history/core/browser/history_service.h"
+ #include "components/optimization_guide/core/optimization_guide_enums.h"
+ #include "components/optimization_guide/core/optimization_guide_features.h"