From 288479a5e1f5d57cb334db88f37773d4da374dc2 Mon Sep 17 00:00:00 2001
From: csagan5 <32685696+csagan5@users.noreply.github.com>
Date: Fri, 3 Dec 2021 10:24:44 +0100
Subject: [PATCH] Minor fixes to build v96

---
 .../Add-bookmark-import-export-actions.patch  | 22 +++++++++++++++++--
 .../Experimental-user-scripts-support.patch   |  2 +-
 2 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/build/patches/Add-bookmark-import-export-actions.patch b/build/patches/Add-bookmark-import-export-actions.patch
index 8be45931..a1d58ca3 100644
--- a/build/patches/Add-bookmark-import-export-actions.patch
+++ b/build/patches/Add-bookmark-import-export-actions.patch
@@ -19,7 +19,7 @@ Completely remove contacts picker permission from the file dialog
  .../browser/bookmarks/BookmarkManager.java    |  22 ++
  .../browser/bookmarks/BookmarkPage.java       |   8 +-
  .../native_page/NativePageFactory.java        |  11 +-
- chrome/browser/BUILD.gn                       |   7 +
+ chrome/browser/BUILD.gn                       |  11 +-
  chrome/browser/about_flags.cc                 |   6 +
  .../android/bookmarks/bookmark_bridge.cc      | 284 ++++++++++++++++++
  .../android/bookmarks/bookmark_bridge.h       |  29 +-
@@ -44,7 +44,7 @@ Completely remove contacts picker permission from the file dialog
  ui/shell_dialogs/select_file_dialog.h         |   2 +
  .../select_file_dialog_android.cc             |   6 +
  ui/shell_dialogs/select_file_dialog_android.h |   2 +
- 38 files changed, 889 insertions(+), 27 deletions(-)
+ 38 files changed, 891 insertions(+), 29 deletions(-)
 
 diff --git a/base/android/content_uri_utils.cc b/base/android/content_uri_utils.cc
 --- a/base/android/content_uri_utils.cc
@@ -800,6 +800,24 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
    configs += [
      "//build/config/compiler:wexit_time_destructors",
      "//build/config:precompiled_headers",
+@@ -2974,6 +2981,8 @@ static_library("browser") {
+       "autofill/manual_filling_view_interface.h",
+       "banners/android/chrome_app_banner_manager_android.cc",
+       "banners/android/chrome_app_banner_manager_android.h",
++      "bookmarks/bookmark_html_writer.cc",
++      "bookmarks/bookmark_html_writer.h",
+       "browser_process_platform_part_android.cc",
+       "browser_process_platform_part_android.h",
+       "chrome_browser_field_trials_mobile.cc",
+@@ -3585,8 +3594,6 @@ static_library("browser") {
+       "badging/badge_manager_factory.h",
+       "banners/app_banner_manager_desktop.cc",
+       "banners/app_banner_manager_desktop.h",
+-      "bookmarks/bookmark_html_writer.cc",
+-      "bookmarks/bookmark_html_writer.h",
+       "cart/cart_db.cc",
+       "cart/cart_db.h",
+       "cart/cart_discount_fetcher.cc",
 diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
 --- a/chrome/browser/about_flags.cc
 +++ b/chrome/browser/about_flags.cc
diff --git a/build/patches/Experimental-user-scripts-support.patch b/build/patches/Experimental-user-scripts-support.patch
index 74256d53..bd1e0f57 100644
--- a/build/patches/Experimental-user-scripts-support.patch
+++ b/build/patches/Experimental-user-scripts-support.patch
@@ -322,7 +322,7 @@ diff --git a/chrome/android/java_sources.gni b/chrome/android/java_sources.gni
 diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
 --- a/chrome/browser/BUILD.gn
 +++ b/chrome/browser/BUILD.gn
-@@ -3489,6 +3489,11 @@ static_library("browser") {
+@@ -3491,6 +3491,11 @@ static_library("browser") {
        ]
        deps += [ "//chrome/android/modules/dev_ui/provider:native" ]
      }