diff --git a/patches/chrome-android-java-AndroidManifest.xml.patch b/patches/chrome-android-java-AndroidManifest.xml.patch index 1c9ee2f348d..390be290d4b 100644 --- a/patches/chrome-android-java-AndroidManifest.xml.patch +++ b/patches/chrome-android-java-AndroidManifest.xml.patch @@ -1,5 +1,5 @@ diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/AndroidManifest.xml -index 41dab4870e1bfea2cf7f52af76fa60ee6ef4ca75..3ccd67c8108b45930d0e319781411c28144eb96e 100644 +index 934324202e0577e9c925363fbec67a91bb3deb42..ebfae463ffd506b1bd8cfef82902a86d3d81f1ad 100644 --- a/chrome/android/java/AndroidManifest.xml +++ b/chrome/android/java/AndroidManifest.xml @@ -59,7 +59,9 @@ by a child template that "extends" this file. diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-ChromeTabbedActivity.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-ChromeTabbedActivity.java.patch index 7e86fe87a1d..d883802eece 100644 --- a/patches/chrome-android-java-src-org-chromium-chrome-browser-ChromeTabbedActivity.java.patch +++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-ChromeTabbedActivity.java.patch @@ -1,8 +1,8 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java -index 7a0f5548a1972b49ada94c6dc479e14cdc0bf40d..aa9f647da0c99943d9e129f7cd8f29297a437aa3 100644 +index 5dd76d1c7f8999332228c236a5fdb03e87ff2ad0..38908a28ecd5a306cadc72573517d7622f7d00eb 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java -@@ -2348,6 +2348,7 @@ public class ChromeTabbedActivity extends ChromeActivity diff --git a/patches/chrome-browser-about_flags.cc.patch b/patches/chrome-browser-about_flags.cc.patch index ea8eb9312c4..7d864cf6902 100644 --- a/patches/chrome-browser-about_flags.cc.patch +++ b/patches/chrome-browser-about_flags.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc -index c2a8ba0ea2555dabe3d305fe2151dc4bdef12d77..ba800373ea77883179cb3516890441bfefd1c3d8 100644 +index e50714dc9f4f87fa315bd1757ba8f96ca8017bbd..f6c57fead42b8afe1bb49441378028c5ce1e496f 100644 --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc @@ -313,14 +313,14 @@ const FeatureEntry::Choice kTouchTextSelectionStrategyChoices[] = { @@ -21,7 +21,7 @@ index c2a8ba0ea2555dabe3d305fe2151dc4bdef12d77..ba800373ea77883179cb3516890441bf const FeatureEntry::Choice kLiteVideoDefaultDownlinkBandwidthKbps[] = { {flags_ui::kGenericExperimentChoiceDefault, "", ""}, -@@ -7503,6 +7503,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -7539,6 +7539,7 @@ const FeatureEntry kFeatureEntries[] = { // "LoginCustomFlags" in tools/metrics/histograms/enums.xml. See "Flag // Histograms" in tools/metrics/histograms/README.md (run the // AboutFlagsHistogramTest unit test to verify this process). diff --git a/patches/chrome-browser-flags-android-chrome_feature_list.cc.patch b/patches/chrome-browser-flags-android-chrome_feature_list.cc.patch index 3e9106f8945..8aeccef5035 100644 --- a/patches/chrome-browser-flags-android-chrome_feature_list.cc.patch +++ b/patches/chrome-browser-flags-android-chrome_feature_list.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browser/flags/android/chrome_feature_list.cc -index d68ef915fdcff9946a13af3e27cfe97de51800e6..d919c4f018f0e592c75fd3ba43794c95b72d3180 100644 +index 729cb2c061d066fe044ce410c75cb88900d09663..f956eaa11a6d9c8de8ac6c42a5fa8636ab3f8094 100644 --- a/chrome/browser/flags/android/chrome_feature_list.cc +++ b/chrome/browser/flags/android/chrome_feature_list.cc -@@ -345,6 +345,7 @@ const base::Feature* const kFeaturesExposedToJava[] = { +@@ -348,6 +348,7 @@ const base::Feature* const kFeaturesExposedToJava[] = { }; const base::Feature* FindFeatureExposedToJava(const std::string& feature_name) { diff --git a/patches/chrome-browser-ui-android-toolbar-java-src-org-chromium-chrome-browser-toolbar-top-ToolbarPhone.java.patch b/patches/chrome-browser-ui-android-toolbar-java-src-org-chromium-chrome-browser-toolbar-top-ToolbarPhone.java.patch index 5b3131fd7d4..394ed03a21f 100644 --- a/patches/chrome-browser-ui-android-toolbar-java-src-org-chromium-chrome-browser-toolbar-top-ToolbarPhone.java.patch +++ b/patches/chrome-browser-ui-android-toolbar-java-src-org-chromium-chrome-browser-toolbar-top-ToolbarPhone.java.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarPhone.java b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarPhone.java -index 98d17317ec97b063ca2a80e3bc447767c546d85a..6d4da6ed0aab5409ee85fcbd379d493c2c44cd6a 100644 +index 2f256b5c415d929755b2572f68ca5c6a6802f014..50133e4346799f7cc240440ff3be696fe5344443 100644 --- a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarPhone.java +++ b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarPhone.java @@ -408,6 +408,7 @@ public class ToolbarPhone extends ToolbarLayout implements OnClickListener, TabC @@ -28,7 +28,7 @@ index 98d17317ec97b063ca2a80e3bc447767c546d85a..6d4da6ed0aab5409ee85fcbd379d493c return Math.max(mToolbarSidePadding, mToolbarButtonsContainer.getMeasuredWidth()); } -@@ -2117,6 +2120,7 @@ public class ToolbarPhone extends ToolbarLayout implements OnClickListener, TabC +@@ -2119,6 +2122,7 @@ public class ToolbarPhone extends ToolbarLayout implements OnClickListener, TabC } else { populateUrlClearExpansionAnimatorSet(animators); } diff --git a/patches/chrome-test-BUILD.gn.patch b/patches/chrome-test-BUILD.gn.patch index f9f27f2772f..fd8bffa5c9d 100644 --- a/patches/chrome-test-BUILD.gn.patch +++ b/patches/chrome-test-BUILD.gn.patch @@ -1,5 +1,5 @@ diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn -index 3ddf1368f8ac78f32f523b2abde0addb79dcd9df..157f69d0091c8f62e92d4347de688bda0005ba58 100644 +index 0fcf061bf93b4b11603ef944cf8dd4d456cf5f45..4e3251cdf1c6b9a830230a4538cc3b2838740314 100644 --- a/chrome/test/BUILD.gn +++ b/chrome/test/BUILD.gn @@ -1307,6 +1307,7 @@ if (!is_android && !is_fuchsia) { diff --git a/patches/components-download-internal-background_service-proto_conversions.cc.patch b/patches/components-download-internal-background_service-proto_conversions.cc.patch index 959361e2858..746de89cfb0 100644 --- a/patches/components-download-internal-background_service-proto_conversions.cc.patch +++ b/patches/components-download-internal-background_service-proto_conversions.cc.patch @@ -1,8 +1,8 @@ diff --git a/components/download/internal/background_service/proto_conversions.cc b/components/download/internal/background_service/proto_conversions.cc -index 560fd484d0362466d9b1af423fe319156441adf1..df41f195b41418094f513c53207d638fc153246e 100644 +index 1768714f0cdde033c566ea93cf94b96842e2a320..88b7d6c5a3ef3c127f39bdd00de513181be62b49 100644 --- a/components/download/internal/background_service/proto_conversions.cc +++ b/components/download/internal/background_service/proto_conversions.cc -@@ -76,6 +76,7 @@ protodb::DownloadClient ProtoConversions::DownloadClientToProto( +@@ -77,6 +77,7 @@ protodb::DownloadClient ProtoConversions::DownloadClientToProto( return protodb::DownloadClient::OPTIMIZATION_GUIDE_PREDICTION_MODELS; case DownloadClient::BOUNDARY: return protodb::DownloadClient::BOUNDARY; @@ -10,7 +10,7 @@ index 560fd484d0362466d9b1af423fe319156441adf1..df41f195b41418094f513c53207d638f } NOTREACHED(); -@@ -107,6 +108,7 @@ DownloadClient ProtoConversions::DownloadClientFromProto( +@@ -108,6 +109,7 @@ DownloadClient ProtoConversions::DownloadClientFromProto( return DownloadClient::OPTIMIZATION_GUIDE_PREDICTION_MODELS; case protodb::DownloadClient::BOUNDARY: return DownloadClient::BOUNDARY; diff --git a/patches/components-download-internal-common-download_item_impl.cc.patch b/patches/components-download-internal-common-download_item_impl.cc.patch index 90ba8d733b4..7890ed7f589 100644 --- a/patches/components-download-internal-common-download_item_impl.cc.patch +++ b/patches/components-download-internal-common-download_item_impl.cc.patch @@ -1,8 +1,8 @@ diff --git a/components/download/internal/common/download_item_impl.cc b/components/download/internal/common/download_item_impl.cc -index e7fa3679ed066d252148cd801f0d920d55803d03..66d984a31cd4dc58fb3b7bbafa5cb759e0fe5abb 100644 +index 8e308eeacd96ef6385b3dab1b86d7c798184cca2..57fc54bb003c1fcd8f15ee0d1c358f52c12ac569 100644 --- a/components/download/internal/common/download_item_impl.cc +++ b/components/download/internal/common/download_item_impl.cc -@@ -2001,8 +2001,8 @@ void DownloadItemImpl::OnDownloadCompleting() { +@@ -2009,8 +2009,8 @@ void DownloadItemImpl::OnDownloadCompleting() { base::Unretained(download_file_.get()), GetTargetFilePath(), delegate_->GetApplicationClientIdForFileScanning(),