Browse Source

Update to 90.0.4430.72

tags/90.0.4430.93-1
wchen342 4 months ago
parent
commit
be33d3a680
Signed by: wchen342 GPG Key ID: 9C19365D69B04CEC
54 changed files with 1386 additions and 4384 deletions
  1. +3
    -3
      .build_config
  2. +1
    -0
      android_flags.gn
  3. +266
    -223
      domain_sub_2.list
  4. +12
    -12
      patches/Bromite/AImageReader-CFI-crash-mitigations.patch
  5. +15
    -15
      patches/Bromite/Add-a-proxy-configuration-page.patch
  6. +12
    -12
      patches/Bromite/Add-bookmark-import-export-actions.patch
  7. +10
    -10
      patches/Bromite/Add-exit-menu-item.patch
  8. +3
    -3
      patches/Bromite/Add-flag-to-disable-WebGL.patch
  9. +10
    -10
      patches/Bromite/Add-flags-to-disable-device-motion-orientation-APIs.patch
  10. +8
    -8
      patches/Bromite/Add-option-to-not-persist-tabs-across-sessions.patch
  11. +2
    -6
      patches/Bromite/Change-default-webRTC-policy-to-not-use-any-address.patch
  12. +1
    -1
      patches/Bromite/Disable-DRM-media-origin-IDs-preprovisioning.patch
  13. +6
    -6
      patches/Bromite/Inject-scripts-for-AMP-tracking-ads-and-video.patch
  14. +4
    -4
      patches/Bromite/Revert-flags-remove-disable-pull-to-refresh-effect.patch
  15. +1
    -1
      patches/Bromite/updater-disable-updater-pings.patch
  16. +11
    -11
      patches/Other/debug-fix.patch
  17. +10
    -0
      patches/Other/ungoogled-main-repo-fix.patch
  18. +4
    -4
      patches/Unobtainium/kill-Auth.patch
  19. +9
    -53
      patches/Unobtainium/kill-GCM.patch
  20. +1
    -1
      patches/Unobtainium/kill-Location-fall-back-to-system.patch
  21. +1
    -1
      patches/Unobtainium/kill-Translate.patch
  22. +1
    -1
      patches/Vanadium/0003-switch-to-fstack-protector-strong.patch
  23. +1
    -1
      patches/Vanadium/0016-disable-seed-based-field-trials.patch
  24. +1
    -1
      patches/Vanadium/0031-disable-media-router-media-remoting-by-default.patch
  25. +3
    -3
      patches/Vanadium/0032-disable-media-router-by-default.patch
  26. +1
    -1
      patches/series
  27. +18
    -19
      patches/src-fix/fix-prefs.patch
  28. +84
    -60
      patches/src-fix/fix-safe-browsing-prefs.patch
  29. +1
    -1
      patches/src-fix/fix-unkown-warning-clang.patch
  30. +4
    -4
      patches/ungoogled-chromium-android/Add-always-desktop-option.patch
  31. +1
    -1
      patches/ungoogled-chromium-android/Add-folder-button-bookmark.patch
  32. +7
    -7
      patches/ungoogled-chromium-android/Add-force-tablet-ui-option.patch
  33. +5
    -5
      patches/ungoogled-chromium-android/Add-save-data-flag.patch
  34. +2
    -2
      patches/ungoogled-chromium-android/Change-package-name-chromium.patch
  35. +1
    -1
      patches/ungoogled-chromium-android/Disable-contextual-search.patch
  36. +18
    -0
      patches/ungoogled-chromium-android/Disable-tflite.patch
  37. +2
    -2
      patches/ungoogled-chromium-android/Enable-ProactivelySwapBrowsingInstance.patch
  38. +19
    -35
      patches/ungoogled-chromium-android/Enable-update-notification.patch
  39. +62
    -12
      patches/ungoogled-chromium-android/Remove-UI-elements.patch
  40. +0
    -18
      patches/ungoogled-chromium-android/Remove-dependency-on-com.google.android.gcm.patch
  41. +63
    -56
      patches/ungoogled-chromium-android/Remove-dependency-on-com.google.android.gms.auth.patch
  42. +81
    -81
      patches/ungoogled-chromium-android/Remove-dependency-on-com.google.android.gms.cast.patch
  43. +166
    -36
      patches/ungoogled-chromium-android/Remove-dependency-on-com.google.android.gms.common-auth-signin-dynamic-com.google.android.gms.tasks.patch
  44. +79
    -137
      patches/ungoogled-chromium-android/Remove-dependency-on-com.google.android.gms.fido-com.google.android.gms.iid-com.google.android.gms.instantapps-com.google.android.gms.location.patch
  45. +14
    -14
      patches/ungoogled-chromium-android/Remove-dependency-on-com.google.android.gms.flags-com.google.android.gms.location.places-com.google.android.gms.stats.patch
  46. +308
    -79
      patches/ungoogled-chromium-android/Remove-dependency-on-com.google.android.gms.gcm.patch
  47. +21
    -27
      patches/ungoogled-chromium-android/Remove-dependency-on-com.google.android.gms.vision-com.google.android.gms.clearcut-com.google.android.gms.phenotype.patch
  48. +23
    -37
      patches/ungoogled-chromium-android/Remove-dependency-on-com.google.android.play.core.splitcompat-com.google.android.play.core.splitinstall.patch
  49. +2
    -45
      patches/ungoogled-chromium-android/Remove-dependency-on-com.google.android.play.patch
  50. BIN
      prebuilt_jar/androidx_fragment_fragment/androidx_fragment_fragment_java.jar
  51. BIN
      prebuilt_jar/androidx_preference_preference/androidx_preference_preference_java.jar
  52. +8
    -8
      pruning_2.list
  53. +0
    -1221
      safe_browsing_proto_files/download_file_types.pb.h
  54. +0
    -2085
      safe_browsing_proto_files/webprotect.pb.h

+ 3
- 3
.build_config View File

@ -8,7 +8,7 @@ webview_target=system_webview_apk
trichrome_webview_target=trichrome_webview_apk
all=all
chromium_version=89.0.4389.114
ungoogled_chromium_version=89.0.4389.114
chromium_version=90.0.4430.72
ungoogled_chromium_version=90.0.4430.72
ungoogled_chromium_revision=1
ungoogled_chromium_android_revision=2
ungoogled_chromium_android_revision=1

+ 1
- 0
android_flags.gn View File

@ -16,6 +16,7 @@ enable_gvr_services=false
enable_swiftshader=false
exclude_unwind_tables=false
ffmpeg_branding="Chrome"
is_chromecast=false
is_clang=true
proprietary_codecs=true
rtc_build_examples=false


+ 266
- 223
domain_sub_2.list
File diff suppressed because it is too large
View File


+ 12
- 12
patches/Bromite/AImageReader-CFI-crash-mitigations.patch View File

@ -80,7 +80,7 @@ See discussions at:
AndroidImageReader();
--- a/chrome/browser/flag-metadata.json
+++ b/chrome/browser/flag-metadata.json
@@ -1724,7 +1724,7 @@
@@ -1856,7 +1856,7 @@
{
"name": "enable-heavy-ad-intervention",
"owners": [ "johnidel", "jkarlin" ],
@ -91,7 +91,7 @@ See discussions at:
"name": "enable-heuristic-stylus-palm-rejection",
--- a/gpu/config/gpu_driver_bug_list.json
+++ b/gpu/config/gpu_driver_bug_list.json
@@ -3255,6 +3255,22 @@
@@ -3237,6 +3237,22 @@
]
},
{
@ -116,7 +116,7 @@ See discussions at:
"description": "DXVA video decoder crashes on some AMD GPUs.",
--- a/gpu/config/gpu_finch_features.cc
+++ b/gpu/config/gpu_finch_features.cc
@@ -38,6 +38,11 @@ bool FieldIsInBlocklist(const char* curr
@@ -49,6 +49,11 @@ bool IsDeviceBlocked(const char* field,
} // namespace
#if defined(OS_ANDROID)
@ -128,7 +128,7 @@ See discussions at:
// Used to limit GL version to 2.0 for skia raster on Android.
const base::Feature kUseGles2ForOopR{"UseGles2ForOopR",
base::FEATURE_DISABLED_BY_DEFAULT};
@@ -55,7 +60,11 @@ const base::FeatureParam<std::string> kA
@@ -70,7 +75,11 @@ const base::Feature kWebViewSurfaceContr
// Use AImageReader for MediaCodec and MediaPlyer on android.
const base::Feature kAImageReader{"AImageReader",
@ -150,10 +150,10 @@ See discussions at:
+GPU_EXPORT extern const base::Feature kAImageReaderMediaPlayer;
GPU_EXPORT extern const base::Feature kUseGles2ForOopR;
GPU_EXPORT extern const base::Feature kAndroidSurfaceControl;
GPU_EXPORT extern const base::Feature kAImageReader;
GPU_EXPORT extern const base::Feature kWebViewSurfaceControl;
--- a/gpu/config/gpu_util.cc
+++ b/gpu/config/gpu_util.cc
@@ -111,6 +111,9 @@ GpuFeatureStatus GetAndroidSurfaceContro
@@ -112,6 +112,9 @@ GpuFeatureStatus GetAndroidSurfaceContro
#if !defined(OS_ANDROID)
return kGpuFeatureStatusDisabled;
#else
@ -163,7 +163,7 @@ See discussions at:
if (!gpu_preferences.enable_android_surface_control)
return kGpuFeatureStatusDisabled;
@@ -316,6 +319,11 @@ void AdjustGpuFeatureStatusToWorkarounds
@@ -317,6 +320,11 @@ void AdjustGpuFeatureStatusToWorkarounds
gpu_feature_info->status_values[GPU_FEATURE_TYPE_ACCELERATED_WEBGL2] =
kGpuFeatureStatusBlocklisted;
}
@ -183,11 +183,11 @@ See discussions at:
disable_accelerated_av1_decode
+disable_aimagereader
disable_accelerated_av1_decode_d3d11
disable_accelerated_h264_encode
disable_accelerated_vp8_decode
disable_accelerated_vp8_encode
--- a/gpu/ipc/service/gpu_init.cc
+++ b/gpu/ipc/service/gpu_init.cc
@@ -477,6 +477,11 @@ bool GpuInit::InitializeAndStartSandbox(
@@ -488,6 +488,11 @@ bool GpuInit::InitializeAndStartSandbox(
}
}
@ -209,7 +209,7 @@ See discussions at:
#include "base/android/scoped_hardware_buffer_fence_sync.h"
#include "base/bind.h"
#include "base/feature_list.h"
@@ -48,7 +49,15 @@ std::unique_ptr<ui::ScopedMakeCurrent> M
@@ -49,7 +50,15 @@ std::unique_ptr<ui::ScopedMakeCurrent> M
}
TextureOwner::Mode GetTextureOwnerMode() {
@ -228,7 +228,7 @@ See discussions at:
}
--- a/media/base/media_switches.cc
+++ b/media/base/media_switches.cc
@@ -608,6 +608,10 @@ const base::Feature kMediaDrmPreprovisio
@@ -624,6 +624,10 @@ const base::Feature kMediaDrmPreprovisio
const base::Feature kMediaDrmPreprovisioningAtStartup{
"MediaDrmPreprovisioningAtStartup", base::FEATURE_ENABLED_BY_DEFAULT};
@ -241,7 +241,7 @@ See discussions at:
const base::Feature kDisableSurfaceLayerForVideo{
--- a/media/base/media_switches.h
+++ b/media/base/media_switches.h
@@ -206,6 +206,7 @@ MEDIA_EXPORT extern const base::Feature
@@ -210,6 +210,7 @@ MEDIA_EXPORT extern const base::Feature
MEDIA_EXPORT extern const base::Feature kMediaDrmPersistentLicense;
MEDIA_EXPORT extern const base::Feature kMediaDrmPreprovisioning;
MEDIA_EXPORT extern const base::Feature kMediaDrmPreprovisioningAtStartup;


+ 15
- 15
patches/Bromite/Add-a-proxy-configuration-page.patch View File

@ -67,7 +67,7 @@ for SimpleURLLoaders as well.
android:title="@string/can_make_payment_title"
--- a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java
@@ -55,9 +55,10 @@ public class PrivacySettings
@@ -58,9 +58,10 @@ public class PrivacySettings
private static final String PREF_CLEAR_BROWSING_DATA = "clear_browsing_data";
private static final String PREF_PRIVACY_SANDBOX = "privacy_sandbox";
private static final String PREF_CLOSE_TABS_ON_EXIT = "close_tabs_on_exit";
@ -92,7 +92,7 @@ for SimpleURLLoaders as well.
builtins_to_provide.push_back(
--- a/chrome/browser/browser_resources.grd
+++ b/chrome/browser/browser_resources.grd
@@ -136,6 +136,12 @@
@@ -162,6 +162,12 @@
<include name="IDR_VIDEO_PLAYER_JS" file="resources\video_tutorials\video_player.js" type="BINDATA" />
</if>
@ -169,16 +169,16 @@ for SimpleURLLoaders as well.
};
--- a/chrome/browser/prefs/browser_prefs.cc
+++ b/chrome/browser/prefs/browser_prefs.cc
@@ -409,6 +409,8 @@
@@ -411,6 +411,8 @@
#include "chrome/browser/media/feeds/media_feeds_service.h"
#endif
+#include "chrome/browser/net/proxy_service_factory.h"
+
namespace {
#if BUILDFLAG(IS_CHROMEOS_ASH)
@@ -695,6 +697,8 @@ void RegisterLocalState(PrefRegistrySimp
#if BUILDFLAG(ENABLE_SESSION_SERVICE)
#include "chrome/browser/sessions/session_service_log.h"
#endif
@@ -744,6 +746,8 @@ void RegisterLocalState(PrefRegistrySimp
PluginsResourceService::RegisterPrefs(registry);
#endif
@ -613,7 +613,7 @@ for SimpleURLLoaders as well.
+})();
--- a/chrome/browser/ui/BUILD.gn
+++ b/chrome/browser/ui/BUILD.gn
@@ -254,6 +254,8 @@ static_library("ui") {
@@ -256,6 +256,8 @@ static_library("ui") {
"webui/metrics_handler.h",
"webui/net_export_ui.cc",
"webui/net_export_ui.h",
@ -624,15 +624,15 @@ for SimpleURLLoaders as well.
"webui/ntp_tiles_internals_ui.cc",
--- a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
+++ b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
@@ -62,6 +62,7 @@
@@ -53,6 +53,7 @@
#include "chrome/browser/ui/webui/omnibox/omnibox_ui.h"
#include "chrome/browser/ui/webui/policy/policy_ui.h"
#include "chrome/browser/ui/webui/predictors/predictors_ui.h"
+#include "chrome/browser/ui/webui/proxy_config_ui.h"
#include "chrome/browser/ui/webui/quota_internals/quota_internals_ui.h"
#include "chrome/browser/ui/webui/settings/settings_ui.h"
#include "chrome/browser/ui/webui/settings/settings_utils.h"
@@ -543,6 +544,8 @@ WebUIFactoryFunction GetWebUIFactoryFunc
#include "chrome/browser/ui/webui/signin_internals_ui.h"
#include "chrome/browser/ui/webui/sync_internals/sync_internals_ui.h"
@@ -556,6 +557,8 @@ WebUIFactoryFunction GetWebUIFactoryFunc
return &NewWebUI<MemoryInternalsUI>;
if (url.host_piece() == chrome::kChromeUINetExportHost)
return &NewWebUI<NetExportUI>;
@ -1108,7 +1108,7 @@ for SimpleURLLoaders as well.
const char kChromeUIChromeURLsHost[] = "chrome-urls";
const char kChromeUIChromeURLsURL[] = "chrome://chrome-urls/";
const char kChromeUIComponentsHost[] = "components";
@@ -325,6 +327,7 @@ bool IsSystemWebUIHost(base::StringPiece
@@ -327,6 +329,7 @@ bool IsSystemWebUIHost(base::StringPiece
kChromeUIMobileSetupHost,
kChromeUIMultiDeviceSetupHost,
kChromeUINetworkHost,
@ -1116,7 +1116,7 @@ for SimpleURLLoaders as well.
kChromeUIOobeHost,
kChromeUIOSCreditsHost,
kChromeUIOSSettingsHost,
@@ -523,6 +526,7 @@ const char* const kChromeHostURLs[] = {
@@ -539,6 +542,7 @@ const char* const kChromeHostURLs[] = {
#if !defined(OS_ANDROID)
#if !BUILDFLAG(IS_CHROMEOS_ASH)
kChromeUIAppLauncherPageHost,
@ -1126,7 +1126,7 @@ for SimpleURLLoaders as well.
kChromeUIDownloadsHost,
--- a/chrome/common/webui_url_constants.h
+++ b/chrome/common/webui_url_constants.h
@@ -117,6 +117,8 @@ extern const char kChromeUIMemoryInterna
@@ -120,6 +120,8 @@ extern const char kChromeUIMemoryInterna
extern const char kChromeUINTPTilesInternalsHost[];
extern const char kChromeUINaClHost[];
extern const char kChromeUINetExportHost[];


+ 12
- 12
patches/Bromite/Add-bookmark-import-export-actions.patch View File

@ -233,7 +233,7 @@ Completely remove contacts picker permission from the file dialog
* Synchronously gets a list of bookmarks that match the specified search query.
* @param query Keyword used for searching bookmarks.
* @param maxNumberOfResult Maximum number of result to fetch.
@@ -1017,6 +1060,24 @@ public class BookmarkBridge {
@@ -1022,6 +1065,24 @@ public class BookmarkBridge {
depthList.add(depth);
}
@ -258,7 +258,7 @@ Completely remove contacts picker permission from the file dialog
private static List<Pair<Integer, Integer>> createPairsList(int[] left, int[] right) {
List<Pair<Integer, Integer>> pairList = new ArrayList<Pair<Integer, Integer>>();
for (int i = 0; i < left.length; i++) {
@@ -1084,6 +1145,8 @@ public class BookmarkBridge {
@@ -1089,6 +1150,8 @@ public class BookmarkBridge {
int getChildCount(long nativeBookmarkBridge, BookmarkBridge caller, long id, int type);
void getChildIDs(long nativeBookmarkBridge, BookmarkBridge caller, long id, int type,
List<BookmarkId> bookmarksList);
@ -362,7 +362,7 @@ Completely remove contacts picker permission from the file dialog
initWithView(mManager.getView());
--- a/chrome/android/java/src/org/chromium/chrome/browser/native_page/NativePageFactory.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/native_page/NativePageFactory.java
@@ -95,7 +95,8 @@ public class NativePageFactory {
@@ -96,7 +96,8 @@ public class NativePageFactory {
protected NativePage buildBookmarksPage(Tab tab) {
return new BookmarkPage(mActivity.getComponentName(), mActivity.getSnackbarManager(),
@ -374,7 +374,7 @@ Completely remove contacts picker permission from the file dialog
protected NativePage buildDownloadsPage(Tab tab) {
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -203,6 +203,8 @@ static_library("browser") {
@@ -204,6 +204,8 @@ static_library("browser") {
"bitmap_fetcher/bitmap_fetcher_service.h",
"bitmap_fetcher/bitmap_fetcher_service_factory.cc",
"bitmap_fetcher/bitmap_fetcher_service_factory.h",
@ -383,7 +383,7 @@ Completely remove contacts picker permission from the file dialog
"bluetooth/bluetooth_chooser_context.cc",
"bluetooth/bluetooth_chooser_context.h",
"bluetooth/bluetooth_chooser_context_factory.cc",
@@ -1910,6 +1912,8 @@ static_library("browser") {
@@ -1891,6 +1893,8 @@ static_library("browser") {
"webapps/chrome_webapps_client.h",
"window_placement/window_placement_permission_context.cc",
"window_placement/window_placement_permission_context.h",
@ -392,15 +392,15 @@ Completely remove contacts picker permission from the file dialog
]
configs += [
@@ -3468,8 +3472,6 @@ static_library("browser") {
@@ -3472,8 +3476,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",
"browsing_data/access_context_audit_database.cc",
"browsing_data/access_context_audit_database.h",
"browsing_data/access_context_audit_service.cc",
"browsing_data/chrome_browsing_data_lifetime_manager.cc",
"browsing_data/chrome_browsing_data_lifetime_manager.h",
"browsing_data/chrome_browsing_data_lifetime_manager_factory.cc",
--- a/chrome/browser/android/bookmarks/bookmark_bridge.cc
+++ b/chrome/browser/android/bookmarks/bookmark_bridge.cc
@@ -39,6 +39,7 @@
@ -835,11 +835,11 @@ Completely remove contacts picker permission from the file dialog
+ "importer/imported_bookmark_entry.cc",
+ "importer/imported_bookmark_entry.h",
]
deps += [ "//components/embedder_support/android/common:url_constants" ]
} else {
# Non-Android.
--- a/chrome/utility/BUILD.gn
+++ b/chrome/utility/BUILD.gn
@@ -73,8 +73,6 @@ static_library("utility") {
@@ -79,8 +79,6 @@ static_library("utility") {
if (!is_android) {
sources += [
@ -848,7 +848,7 @@ Completely remove contacts picker permission from the file dialog
"importer/bookmarks_file_importer.cc",
"importer/bookmarks_file_importer.h",
"importer/external_process_importer_bridge.cc",
@@ -191,6 +189,11 @@ static_library("utility") {
@@ -180,6 +178,11 @@ static_library("utility") {
}
}


+ 10
- 10
patches/Bromite/Add-exit-menu-item.patch View File

@ -14,7 +14,7 @@ Corrected Exit functionality
--- a/chrome/android/java/res/menu/main_menu.xml
+++ b/chrome/android/java/res/menu/main_menu.xml
@@ -116,6 +116,9 @@
@@ -119,6 +119,9 @@
android:icon="@drawable/vr_headset" />
<item android:id="@+id/managed_by_menu_id"
android:title="@string/managed" />
@ -24,7 +24,7 @@ Corrected Exit functionality
</group>
<!-- Items shown only in the tab switcher -->
@@ -142,6 +145,8 @@
@@ -145,6 +148,8 @@
<item android:id="@id/preferences_id"
android:title="@string/menu_settings"
android:icon="@drawable/settings_cog" />
@ -35,7 +35,7 @@ Corrected Exit functionality
<!-- Items shown only in the tab switcher when start surface is enabled -->
--- a/chrome/android/java/res/menu/main_menu_regroup.xml
+++ b/chrome/android/java/res/menu/main_menu_regroup.xml
@@ -181,6 +181,9 @@
@@ -184,6 +184,9 @@
android:icon="@drawable/vr_headset" />
<item android:id="@+id/managed_by_menu_id"
android:title="@string/managed" />
@ -52,10 +52,10 @@ Corrected Exit functionality
import org.chromium.chrome.browser.accessibility_tab_switcher.OverviewListLayout;
import org.chromium.chrome.browser.app.ChromeActivity;
+import org.chromium.chrome.browser.ApplicationLifetime;
import org.chromium.chrome.browser.app.metrics.LaunchCauseMetrics;
import org.chromium.chrome.browser.app.metrics.TabbedActivityLaunchCauseMetrics;
import org.chromium.chrome.browser.app.tabmodel.AsyncTabParamsManagerSingleton;
import org.chromium.chrome.browser.app.tabmodel.ChromeNextTabPolicySupplier;
import org.chromium.chrome.browser.app.tabmodel.TabWindowManagerSingleton;
@@ -1827,6 +1828,8 @@ public class ChromeTabbedActivity extend
@@ -1858,6 +1859,8 @@ public class ChromeTabbedActivity extend
} else if (id == R.id.close_tab) {
getCurrentTabModel().closeTab(currentTab, true, false, true);
RecordUserAction.record("MobileTabClosed");
@ -66,7 +66,7 @@ Corrected Exit functionality
getTabModelSelector().closeAllTabs();
--- a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java
@@ -56,6 +56,7 @@ import org.chromium.base.supplier.Onesho
@@ -57,6 +57,7 @@ import org.chromium.base.supplier.Unowne
import org.chromium.chrome.R;
import org.chromium.chrome.browser.ActivityTabProvider;
import org.chromium.chrome.browser.AppHooks;
@ -74,8 +74,8 @@ Corrected Exit functionality
import org.chromium.chrome.browser.ChromeActivitySessionTracker;
import org.chromium.chrome.browser.ChromeApplication;
import org.chromium.chrome.browser.ChromeWindow;
@@ -2018,6 +2019,11 @@ public abstract class ChromeActivity<C e
RecordUserAction.record("MobileMenuSettings");
@@ -2200,6 +2201,11 @@ public abstract class ChromeActivity<C e
return true;
}
+ if (id == R.id.exit_id) {
@ -103,7 +103,7 @@ Corrected Exit functionality
@Override
--- a/chrome/browser/ui/android/strings/android_chrome_strings.grd
+++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd
@@ -2967,6 +2967,9 @@ Data from your Incognito session will on
@@ -3008,6 +3008,9 @@ Data from your Incognito session will on
<message name="IDS_MENU_SETTINGS" desc="Menu item for opening browser settings. [CHAR-LIMIT=27]">
Settings
</message>


+ 3
- 3
patches/Bromite/Add-flag-to-disable-WebGL.patch View File

@ -10,7 +10,7 @@ Subject: Add flag to disable WebGL
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -2589,6 +2589,9 @@ const FeatureEntry kFeatureEntries[] = {
@@ -2620,6 +2620,9 @@ const FeatureEntry kFeatureEntries[] = {
flag_descriptions::kAccelerated2dCanvasName,
flag_descriptions::kAccelerated2dCanvasDescription, kOsAll,
SINGLE_DISABLE_VALUE_TYPE(switches::kDisableAccelerated2dCanvas)},
@ -22,7 +22,7 @@ Subject: Add flag to disable WebGL
SINGLE_VALUE_TYPE(cc::switches::kShowCompositedLayerBorders)},
--- a/chrome/browser/flag_descriptions.cc
+++ b/chrome/browser/flag_descriptions.cc
@@ -511,6 +511,10 @@ const char kEnableAudioFocusEnforcementN
@@ -562,6 +562,10 @@ const char kEnableAudioFocusEnforcementN
const char kEnableAudioFocusEnforcementDescription[] =
"Enables enforcement of a single media session having audio focus at "
"any one time. Requires #enable-media-session-service to be enabled too.";
@ -35,7 +35,7 @@ Subject: Add flag to disable WebGL
"Enable the account data storage for autofill";
--- a/chrome/browser/flag_descriptions.h
+++ b/chrome/browser/flag_descriptions.h
@@ -317,6 +317,9 @@ extern const char kDisallowDocWrittenScr
@@ -347,6 +347,9 @@ extern const char kDisallowDocWrittenScr
extern const char kEnableAccessibilityObjectModelName[];
extern const char kEnableAccessibilityObjectModelDescription[];


+ 10
- 10
patches/Bromite/Add-flags-to-disable-device-motion-orientation-APIs.patch View File

@ -19,7 +19,7 @@ legacy acceleration events.
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -2789,6 +2789,12 @@ const FeatureEntry kFeatureEntries[] = {
@@ -2846,6 +2846,12 @@ const FeatureEntry kFeatureEntries[] = {
{"enable-gpu-rasterization", flag_descriptions::kGpuRasterizationName,
flag_descriptions::kGpuRasterizationDescription, kOsAll,
MULTI_VALUE_TYPE(kEnableGpuRasterizationChoices)},
@ -34,7 +34,7 @@ legacy acceleration events.
MULTI_VALUE_TYPE(kEnableOopRasterizationChoices)},
--- a/chrome/browser/flag_descriptions.cc
+++ b/chrome/browser/flag_descriptions.cc
@@ -755,6 +755,14 @@ const char kWinrtSensorsImplementationDe
@@ -821,6 +821,14 @@ const char kWinrtSensorsImplementationDe
"Enables usage of the Windows.Devices.Sensors WinRT APIs on Windows for "
"sensors";
@ -51,7 +51,7 @@ legacy acceleration events.
const char kEnableGenericSensorExtraClassesDescription[] =
--- a/chrome/browser/flag_descriptions.h
+++ b/chrome/browser/flag_descriptions.h
@@ -455,6 +455,12 @@ extern const char kWinrtGeolocationImple
@@ -494,6 +494,12 @@ extern const char kWinrtGeolocationImple
extern const char kWinrtSensorsImplementationName[];
extern const char kWinrtSensorsImplementationDescription[];
@ -78,7 +78,7 @@ legacy acceleration events.
#else
--- a/content/public/common/content_features.cc
+++ b/content/public/common/content_features.cc
@@ -837,6 +837,16 @@ const base::Feature kWebOtpBackendAuto{"
@@ -886,6 +886,16 @@ const base::Feature kWebOtpBackendAuto{"
// The JavaScript API for payments on the web.
const base::Feature kWebPayments{"WebPayments",
base::FEATURE_ENABLED_BY_DEFAULT};
@ -97,7 +97,7 @@ legacy acceleration events.
const base::Feature kWebPaymentsMinimalUI{"WebPaymentsMinimalUI",
--- a/content/public/common/content_features.h
+++ b/content/public/common/content_features.h
@@ -197,6 +197,8 @@ CONTENT_EXPORT extern const base::Featur
@@ -209,6 +209,8 @@ CONTENT_EXPORT extern const base::Featur
CONTENT_EXPORT extern const base::Feature kWebXrHitTest;
CONTENT_EXPORT extern const base::Feature kWebXrIncubations;
@ -108,15 +108,15 @@ legacy acceleration events.
CONTENT_EXPORT extern const base::Feature
--- a/third_party/blink/public/platform/web_runtime_features.h
+++ b/third_party/blink/public/platform/web_runtime_features.h
@@ -97,6 +97,8 @@ class WebRuntimeFeatures {
@@ -104,6 +104,8 @@ class WebRuntimeFeatures {
BLINK_PLATFORM_EXPORT static void EnableCSSHexAlphaColor(bool);
BLINK_PLATFORM_EXPORT static void EnableSameSiteByDefaultCookies(bool);
BLINK_PLATFORM_EXPORT static void EnableScrollTopLeftInterop(bool);
+ BLINK_PLATFORM_EXPORT static void EnableDeviceMotion(bool);
+ BLINK_PLATFORM_EXPORT static void EnableDeviceOrientation(bool);
BLINK_PLATFORM_EXPORT static void EnableKeyboardAccessibleTooltip(bool);
BLINK_PLATFORM_EXPORT static void EnableKeyboardFocusableScrollers(bool);
BLINK_PLATFORM_EXPORT static void EnableDatabase(bool);
BLINK_PLATFORM_EXPORT static void EnableDecodeJpeg420ImagesToYUV(bool);
--- a/third_party/blink/renderer/modules/modules_initializer.cc
+++ b/third_party/blink/renderer/modules/modules_initializer.cc
@@ -222,9 +222,13 @@ void ModulesInitializer::OnClearWindowOb
@ -138,8 +138,8 @@ legacy acceleration events.
// TODO(nhiroki): Figure out why ServiceWorkerContainer needs to be eagerly
--- a/third_party/blink/renderer/platform/exported/web_runtime_features.cc
+++ b/third_party/blink/renderer/platform/exported/web_runtime_features.cc
@@ -175,6 +175,14 @@ void WebRuntimeFeatures::EnableScrollTop
RuntimeEnabledFeatures::SetScrollTopLeftInteropEnabled(enable);
@@ -195,6 +195,14 @@ void WebRuntimeFeatures::EnableKeyboardA
RuntimeEnabledFeatures::SetKeyboardAccessibleTooltipEnabled(enable);
}
+void WebRuntimeFeatures::EnableDeviceMotion(bool enable) {
@ -155,7 +155,7 @@ legacy acceleration events.
}
--- a/third_party/blink/renderer/platform/runtime_enabled_features.json5
+++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5
@@ -1386,6 +1386,14 @@
@@ -1438,6 +1438,14 @@
status: "experimental",
},
{


+ 8
- 8
patches/Bromite/Add-option-to-not-persist-tabs-across-sessions.patch View File

@ -56,7 +56,7 @@ Subject: Add option to not persist tabs across sessions
</PreferenceScreen>
--- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
@@ -1117,8 +1117,10 @@ public class ChromeTabbedActivity extend
@@ -1128,8 +1128,10 @@ public class ChromeTabbedActivity extend
boolean hadCipherData =
CipherFactory.getInstance().restoreFromBundle(getSavedInstanceState());
@ -67,7 +67,7 @@ Subject: Add option to not persist tabs across sessions
+ ContextUtils.getAppSharedPreferences().getBoolean(PREF_CLOSE_TABS_ON_EXIT, false);
if (noRestoreState) {
// Clear the state files because they are inconsistent and useless from now on.
mTabModelSelectorImpl.clearState();
mTabModelOrchestrator.clearState();
--- a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java
@@ -5,6 +5,7 @@
@ -87,7 +87,7 @@ Subject: Add option to not persist tabs across sessions
import org.chromium.chrome.R;
import org.chromium.chrome.browser.feedback.HelpAndFeedbackLauncherImpl;
import org.chromium.chrome.browser.flags.ChromeFeatureList;
@@ -51,8 +54,10 @@ public class PrivacySettings
@@ -54,8 +57,10 @@ public class PrivacySettings
private static final String PREF_SAFE_BROWSING = "safe_browsing";
private static final String PREF_CLEAR_BROWSING_DATA = "clear_browsing_data";
private static final String PREF_PRIVACY_SANDBOX = "privacy_sandbox";
@ -98,7 +98,7 @@ Subject: Add option to not persist tabs across sessions
PREF_SECURE_DNS, PREF_DO_NOT_TRACK, PREF_PRIVACY_SANDBOX};
private ManagedPreferenceDelegate mManagedPreferenceDelegate;
@@ -151,7 +156,11 @@ public class PrivacySettings
@@ -166,7 +171,11 @@ public class PrivacySettings
@Override
public boolean onPreferenceChange(Preference preference, Object newValue) {
String key = preference.getKey();
@ -111,9 +111,9 @@ Subject: Add option to not persist tabs across sessions
UserPrefs.get(Profile.getLastUsedRegularProfile())
.setBoolean(Pref.CAN_MAKE_PAYMENT_ENABLED, (boolean) newValue);
} else if (PREF_NETWORK_PREDICTIONS.equals(key)) {
@@ -215,6 +224,11 @@ public class PrivacySettings
getPreferenceScreen().removePreference(usageStatsPref);
}
@@ -236,6 +245,11 @@ public class PrivacySettings
privacySandboxPreference.setSummary(
PrivacySandboxSettingsFragment.getStatusString(getContext()));
}
+
+ ChromeSwitchPreference closeTabsOnExitPref =
@ -125,7 +125,7 @@ Subject: Add option to not persist tabs across sessions
private ChromeManagedPreferenceDelegate createManagedPreferenceDelegate() {
--- a/chrome/browser/ui/android/strings/android_chrome_strings.grd
+++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd
@@ -3771,6 +3771,12 @@ Data from your Incognito session will on
@@ -3803,6 +3803,12 @@ Data from your Incognito session will on
<message name="IDS_CONTEXTMENU_IMAGE_TITLE" desc="The title of a context menu tab when the item pressed contains more than one type. This indicates that all the actions are related to the image.">
IMAGE
</message>


+ 2
- 6
patches/Bromite/Change-default-webRTC-policy-to-not-use-any-address.patch View File

@ -6,13 +6,12 @@ This prevents leakage of the local IP address.
See also: https://github.com/bromite/bromite/issues/553
---
.../peerconnection/peer_connection_dependency_factory.cc | 7 ++++---
third_party/blink/renderer/modules/peerconnection/peer_connection_dependency_factory.cc | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/third_party/blink/renderer/modules/peerconnection/peer_connection_dependency_factory.cc b/third_party/blink/renderer/modules/peerconnection/peer_connection_dependency_factory.cc
--- a/third_party/blink/renderer/modules/peerconnection/peer_connection_dependency_factory.cc
+++ b/third_party/blink/renderer/modules/peerconnection/peer_connection_dependency_factory.cc
@@ -461,12 +461,13 @@ PeerConnectionDependencyFactory::CreatePortAllocator(
@@ -462,12 +462,13 @@ PeerConnectionDependencyFactory::CreateP
port_config.enable_nonproxied_udp = false;
break;
case DEFAULT:
@ -29,6 +28,3 @@ diff --git a/third_party/blink/renderer/modules/peerconnection/peer_connection_d
<< "policy: " << policy
<< ", multiple_routes: " << port_config.enable_multiple_routes
<< ", nonproxied_udp: " << port_config.enable_nonproxied_udp
--
2.17.1

+ 1
- 1
patches/Bromite/Disable-DRM-media-origin-IDs-preprovisioning.patch View File

@ -8,7 +8,7 @@ Subject: Disable DRM media origin IDs preprovisioning
--- a/media/base/media_switches.cc
+++ b/media/base/media_switches.cc
@@ -599,7 +599,7 @@ const base::Feature kMediaDrmPersistentL
@@ -615,7 +615,7 @@ const base::Feature kMediaDrmPersistentL
// MediaDrmBridge. If disabled, MediaDrmBridge will get unprovisioned origin IDs
// which will trigger provisioning process after MediaDrmBridge is created.
const base::Feature kMediaDrmPreprovisioning{"MediaDrmPreprovisioning",


+ 6
- 6
patches/Bromite/Inject-scripts-for-AMP-tracking-ads-and-video.patch View File

@ -20,7 +20,7 @@ Send a random key press to circumvent idle status detection
--- a/third_party/blink/renderer/core/dom/build.gni
+++ b/third_party/blink/renderer/core/dom/build.gni
@@ -165,6 +165,8 @@ blink_core_sources_dom = [
@@ -167,6 +167,8 @@ blink_core_sources_dom = [
"global_event_handlers.h",
"icon_url.cc",
"icon_url.h",
@ -31,7 +31,7 @@ Send a random key press to circumvent idle status detection
"id_target_observer_registry.cc",
--- a/third_party/blink/renderer/core/dom/document.cc
+++ b/third_party/blink/renderer/core/dom/document.cc
@@ -273,6 +273,7 @@
@@ -276,6 +276,7 @@
#include "third_party/blink/renderer/core/page/scrolling/root_scroller_controller.h"
#include "third_party/blink/renderer/core/page/scrolling/scroll_state_callback.h"
#include "third_party/blink/renderer/core/page/scrolling/scrolling_coordinator.h"
@ -39,7 +39,7 @@ Send a random key press to circumvent idle status detection
#include "third_party/blink/renderer/core/page/scrolling/snap_coordinator.h"
#include "third_party/blink/renderer/core/page/scrolling/text_fragment_anchor.h"
#include "third_party/blink/renderer/core/page/scrolling/text_fragment_selector_generator.h"
@@ -338,6 +339,8 @@
@@ -341,6 +342,8 @@
#include "third_party/blink/renderer/platform/wtf/text/string_buffer.h"
#include "third_party/blink/renderer/platform/wtf/text/text_encoding_registry.h"
@ -48,7 +48,7 @@ Send a random key press to circumvent idle status detection
#ifndef NDEBUG
using WeakDocumentSet = blink::HeapHashSet<blink::WeakMember<blink::Document>>;
static WeakDocumentSet& liveDocumentSet();
@@ -6912,6 +6915,61 @@ void Document::setAllowDeclarativeShadow
@@ -6868,6 +6871,61 @@ void Document::setAllowDeclarativeShadow
val ? AllowState::kAllow : AllowState::kDeny;
}
@ -110,7 +110,7 @@ Send a random key press to circumvent idle status detection
void Document::FinishedParsing() {
DCHECK(!GetScriptableDocumentParser() || !parser_->IsParsing());
DCHECK(!GetScriptableDocumentParser() || ready_state_ != kLoading);
@@ -6964,6 +7022,10 @@ void Document::FinishedParsing() {
@@ -6920,6 +6978,10 @@ void Document::FinishedParsing() {
frame->Loader().FinishedParsing();
@ -123,7 +123,7 @@ Send a random key press to circumvent idle status detection
inspector_mark_load_event::Data(frame));
--- a/third_party/blink/renderer/core/dom/document.h
+++ b/third_party/blink/renderer/core/dom/document.h
@@ -1699,6 +1699,9 @@ class CORE_EXPORT Document : public Cont
@@ -1725,6 +1725,9 @@ class CORE_EXPORT Document : public Cont
void AddAXContext(AXContext*);
void RemoveAXContext(AXContext*);


+ 4
- 4
patches/Bromite/Revert-flags-remove-disable-pull-to-refresh-effect.patch View File

@ -12,7 +12,7 @@ This reverts commit 4e598f38a0e6dd3dbede009c6a99b2a520a94e1f.
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -3189,6 +3189,10 @@ const FeatureEntry kFeatureEntries[] = {
@@ -3262,6 +3262,10 @@ const FeatureEntry kFeatureEntries[] = {
SINGLE_VALUE_TYPE(switches::kHostedAppQuitNotification)},
#endif // OS_MAC
#if defined(OS_ANDROID)
@ -25,7 +25,7 @@ This reverts commit 4e598f38a0e6dd3dbede009c6a99b2a520a94e1f.
flag_descriptions::kTranslateForceTriggerOnEnglishDescription, kOsAndroid,
--- a/chrome/browser/flag-metadata.json
+++ b/chrome/browser/flag-metadata.json
@@ -969,6 +969,11 @@
@@ -1092,6 +1092,11 @@
"expiry_milestone": -1
},
{
@ -39,7 +39,7 @@ This reverts commit 4e598f38a0e6dd3dbede009c6a99b2a520a94e1f.
"expiry_milestone": 83
--- a/chrome/browser/flag_descriptions.cc
+++ b/chrome/browser/flag_descriptions.cc
@@ -3107,6 +3107,10 @@ const char kReadLaterDescription[] =
@@ -3236,6 +3236,10 @@ const char kReadLaterDescription[] =
"Allow users to save tabs for later. Enables a new button and menu for "
"accessing tabs saved for later.";
@ -52,7 +52,7 @@ This reverts commit 4e598f38a0e6dd3dbede009c6a99b2a520a94e1f.
"Determines what pages the Reader Mode infobar is shown on.";
--- a/chrome/browser/flag_descriptions.h
+++ b/chrome/browser/flag_descriptions.h
@@ -1796,6 +1796,9 @@ extern const char kQueryTilesMoreTrendin
@@ -1873,6 +1873,9 @@ extern const char kQueryTilesMoreTrendin
extern const char kQueryTilesSwapTrendingName[];
extern const char kQueryTilesSwapTrendingDescription[];


+ 1
- 1
patches/Bromite/updater-disable-updater-pings.patch View File

@ -54,5 +54,5 @@ Chromium would still send background requests. Kill it.
const bool pings_enabled_;
- const bool require_encryption_;
const GURL url_source_override_;
const int initial_delay_;
const double initial_delay_;

+ 11
- 11
patches/Other/debug-fix.patch View File

@ -41,7 +41,7 @@ Subject: Remove DCHECK and other lines causing Debug builds to fail
--- a/build/config/compiler/BUILD.gn
+++ b/build/config/compiler/BUILD.gn
@@ -229,7 +229,7 @@ config("compiler") {
@@ -237,7 +237,7 @@ config("compiler") {
cflags_cc = []
cflags_objc = []
cflags_objcc = []
@ -50,7 +50,7 @@ Subject: Remove DCHECK and other lines causing Debug builds to fail
defines = []
configs = []
@@ -1751,7 +1751,7 @@ config("no_rtti") {
@@ -1806,7 +1806,7 @@ config("no_rtti") {
# to heap-allocated memory are passed over shared library boundaries.
config("export_dynamic") {
# TODO(crbug.com/1052397): Revisit after target_os flip is completed.
@ -59,7 +59,7 @@ Subject: Remove DCHECK and other lines causing Debug builds to fail
ldflags = [ "-rdynamic" ]
}
}
@@ -1972,8 +1972,6 @@ if (is_win) {
@@ -2027,8 +2027,6 @@ if (is_win) {
# Put data and code in their own sections, so that unused symbols
# can be removed at link time with --gc-sections.
@ -68,7 +68,7 @@ Subject: Remove DCHECK and other lines causing Debug builds to fail
]
common_optimize_on_ldflags += [
@@ -1981,7 +1979,6 @@ if (is_win) {
@@ -2036,7 +2034,6 @@ if (is_win) {
# See http://lwn.net/Articles/192624/ .
# -O2 enables string tail merge optimization in gold and lld.
"-Wl,-O2",
@ -76,7 +76,7 @@ Subject: Remove DCHECK and other lines causing Debug builds to fail
]
}
}
@@ -2354,7 +2351,7 @@ config("symbols") {
@@ -2414,7 +2411,7 @@ config("symbols") {
# sections (llvm.org/PR34820).
cflags += [ "-ggnu-pubnames" ]
}
@ -107,7 +107,7 @@ Subject: Remove DCHECK and other lines causing Debug builds to fail
return std::make_unique<ProfileOAuth2TokenService>(
--- a/components/omnibox/browser/autocomplete_match.cc
+++ b/components/omnibox/browser/autocomplete_match.cc
@@ -1355,16 +1355,6 @@ bool AutocompleteMatch::IsEmptyAutocompl
@@ -1398,16 +1398,6 @@ bool AutocompleteMatch::IsEmptyAutocompl
split_autocompletion.Empty();
}
@ -126,7 +126,7 @@ Subject: Remove DCHECK and other lines causing Debug builds to fail
const base::string16& text,
--- a/components/omnibox/browser/autocomplete_result.cc
+++ b/components/omnibox/browser/autocomplete_result.cc
@@ -720,13 +720,6 @@ void AutocompleteResult::CopyFrom(const
@@ -716,13 +716,6 @@ void AutocompleteResult::CopyFrom(const
#endif
}
@ -154,7 +154,7 @@ Subject: Remove DCHECK and other lines causing Debug builds to fail
for (ShortcutMap::const_iterator it(
--- a/components/omnibox/browser/autocomplete_controller.cc
+++ b/components/omnibox/browser/autocomplete_controller.cc
@@ -748,9 +748,6 @@ void AutocompleteController::UpdateResul
@@ -744,9 +744,6 @@ void AutocompleteController::UpdateResul
// Need to validate before invoking CopyOldMatches as the old matches are not
// valid against the current input.
@ -178,7 +178,7 @@ Subject: Remove DCHECK and other lines causing Debug builds to fail
bool InputEventStreamValidator::ValidateImpl(
--- a/services/network/network_context.cc
+++ b/services/network/network_context.cc
@@ -965,7 +965,6 @@ void NetworkContext::QueueReport(
@@ -964,7 +964,6 @@ void NetworkContext::QueueReport(
const net::NetworkIsolationKey& network_isolation_key,
const base::Optional<std::string>& user_agent,
base::Value body) {
@ -188,7 +188,7 @@ Subject: Remove DCHECK and other lines causing Debug builds to fail
void NetworkContext::QueueSignedExchangeReport(
--- a/url/gurl.cc
+++ b/url/gurl.cc
@@ -158,7 +158,7 @@ const std::string& GURL::spec() const {
@@ -159,7 +159,7 @@ const std::string& GURL::spec() const {
if (is_valid_ || spec_.empty())
return spec_;
@ -199,7 +199,7 @@ Subject: Remove DCHECK and other lines causing Debug builds to fail
--- a/base/logging.cc
+++ b/base/logging.cc
@@ -884,7 +884,7 @@ LogMessage::~LogMessage() {
@@ -885,7 +885,7 @@ LogMessage::~LogMessage() {
#if defined(OFFICIAL_BUILD) && defined(NDEBUG)
IMMEDIATE_CRASH();
#else


+ 10
- 0
patches/Other/ungoogled-main-repo-fix.patch View File

@ -15,3 +15,13 @@ author: Wengling Chen <[email protected]>
fieldtrial_testing_like_official_build=true
google_api_key=""
google_default_client_id=""
--- a/pruning.list
+++ b/pruning.list
@@ -17462,7 +17462,6 @@ third_party/pyelftools/test/testfiles_for_unittests/simple_gcc.elf.arm
third_party/pywebsocket3/src/test/cert/client_cert.p12
third_party/quic_trace/src/examples/example.json.gz
third_party/quic_trace/src/examples/example.qtr
-third_party/r8/custom_d8.jar
third_party/skia/experimental/wasm-skp-debugger/debugger/anim.mskp
third_party/skia/experimental/wasm-skp-debugger/debugger/sample.skp
third_party/skia/modules/canvaskit/tests/assets/Roboto-Regular.otf

+ 4
- 4
patches/Unobtainium/kill-Auth.patch View File

@ -3,8 +3,8 @@ Date: Fri, 22 Jun 2018 17:06:15 +0200
Subject: kill Auth
---
chrome/browser/signin/services/android/java/src/org/chromium/chrome/browser/signin/services/SigninHelper.java | 19 ----
components/signin/core/browser/android/java/src/org/chromium/components/signin/SystemAccountManagerDelegate.java | 42 ----------
chrome/browser/signin/services/android/java/src/org/chromium/chrome/browser/signin/services/SigninHelper.java | 19 ----
components/signin/public/android/java/src/org/chromium/components/signin/SystemAccountManagerDelegate.java | 42 ----------
2 files changed, 3 insertions(+), 58 deletions(-)
--- a/chrome/browser/signin/services/android/java/src/org/chromium/chrome/browser/signin/services/SigninHelper.java
@ -42,8 +42,8 @@ Subject: kill Auth
return new ArrayList<>(0);
}
}
--- a/components/signin/core/browser/android/java/src/org/chromium/components/signin/SystemAccountManagerDelegate.java
+++ b/components/signin/core/browser/android/java/src/org/chromium/components/signin/SystemAccountManagerDelegate.java
--- a/components/signin/public/android/java/src/org/chromium/components/signin/SystemAccountManagerDelegate.java
+++ b/components/signin/public/android/java/src/org/chromium/components/signin/SystemAccountManagerDelegate.java
@@ -26,11 +26,6 @@ import android.os.SystemClock;
import androidx.annotation.Nullable;


+ 9
- 53
patches/Unobtainium/kill-GCM.patch View File

@ -3,29 +3,16 @@ Date: Fri, 22 Jun 2018 17:11:38 +0200
Subject: kill GCM
---
chrome/android/BUILD.gn | 1
chrome/android/chrome_java_sources.gni | 5
chrome/android/java/AndroidManifest.xml | 53 --
chrome/android/java/AndroidManifest.xml | 42 --
chrome/android/java/src/org/chromium/chrome/browser/background_task_scheduler/ChromeBackgroundTaskFactory.java | 3
chrome/android/java/src/org/chromium/chrome/browser/services/gcm/GCMBackgroundTask.java | 1
components/background_task_scheduler/internal/android/java/src/org/chromium/components/background_task_scheduler/internal/BackgroundTaskGcmTaskService.java | 65 ---
components/background_task_scheduler/internal/android/java/src/org/chromium/components/background_task_scheduler/internal/BackgroundTaskSchedulerGcmNetworkManager.java | 180 ----------
components/gcm_driver/android/BUILD.gn | 1
components/gcm_driver/instance_id/android/BUILD.gn | 1
components/gcm_driver/instance_id/android/java/src/org/chromium/components/gcm_driver/instance_id/InstanceIDBridge.java | 52 --
components/sync/android/BUILD.gn | 1
11 files changed, 11 insertions(+), 352 deletions(-)
8 files changed, 11 insertions(+), 338 deletions(-)
--- a/chrome/android/BUILD.gn
+++ b/chrome/android/BUILD.gn
@@ -523,7 +523,6 @@ android_library("chrome_java") {
"//third_party/android_deps:material_design_java",
"//third_party/android_deps:protobuf_lite_runtime_java",
"//third_party/android_media:android_media_java",
- "//third_party/android_sdk:android_gcm_java",
"//third_party/android_sdk/androidx_browser:androidx_browser_java",
"//third_party/android_swipe_refresh:android_swipe_refresh_java",
"//third_party/blink/public:blink_headers_java",
--- a/chrome/android/chrome_java_sources.gni
+++ b/chrome/android/chrome_java_sources.gni
@@ -15,7 +15,6 @@ chrome_java_sources = [
@ -36,7 +23,7 @@ Subject: kill GCM
"java/src/org/chromium/chrome/browser/ChromeBackupAgentImpl.java",
"java/src/org/chromium/chrome/browser/ChromeBackupWatcher.java",
"java/src/org/chromium/chrome/browser/ChromeBaseAppCompatActivity.java",
@@ -1217,10 +1216,6 @@ chrome_java_sources = [
@@ -1205,10 +1204,6 @@ chrome_java_sources = [
"java/src/org/chromium/chrome/browser/searchwidget/SearchWidgetProvider.java",
"java/src/org/chromium/chrome/browser/send_tab_to_self/SendTabToSelfShareActivity.java",
"java/src/org/chromium/chrome/browser/services/AccountsChangedReceiver.java",
@ -73,20 +60,10 @@ Subject: kill GCM
<uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT"/>
<uses-permission android:name="com.google.android.apps.now.CURRENT_ACCOUNT_ACCESS" />
@@ -935,36 +930,6 @@ by a child template that "extends" this
@@ -944,25 +939,6 @@ by a child template that "extends" this
android:configChanges="orientation|keyboardHidden|keyboard|screenSize|mcc|mnc|screenLayout|smallestScreenSize"
android:hardwareAccelerated="false" />
- <!-- Receiver for GCM messages. -->
- <receiver android:name="com.google.android.gms.gcm.GcmReceiver"
- android:exported="true"
- android:permission="com.google.android.c2dm.permission.SEND">
- <intent-filter>
- <action android:name="com.google.android.c2dm.intent.RECEIVE" />
- <action android:name="com.google.android.c2dm.intent.REGISTRATION" />
- <category android:name="{{ manifest_package }}"/>
- </intent-filter>
- </receiver>
- <!-- GcmTaskService for registration for Invalidations. Not actually implemented anymore. -->
- <service android:name="com.google.ipc.invalidation.ticl.android2.channel.GcmRegistrationTaskService"
- android:exported="true"
@ -99,18 +76,17 @@ Subject: kill GCM
- <service android:name="org.chromium.chrome.browser.services.gcm.ChromeGcmListenerService"
- android:exported="false" >
- <intent-filter>
- <action android:name="com.google.android.c2dm.intent.RECEIVE" />
- <action android:name="com.google.firebase.MESSAGING_EVENT" />
- </intent-filter>
- </service>
- <service android:name="org.chromium.chrome.browser.services.gcm.GCMBackgroundService"
- android:exported="false"/>
- <service android:name="org.chromium.chrome.browser.services.gcm.InvalidationGcmUpstreamSender"
- android:exported="false"/>
-
<!-- Android Notification service listener -->
<service android:name="org.chromium.chrome.browser.notifications.NotificationService"
android:exported="false"/>
@@ -988,28 +953,10 @@ by a child template that "extends" this
@@ -987,28 +963,10 @@ by a child template that "extends" this
android:exported="false"
android:permission="android.permission.BIND_JOB_SERVICE"/>
@ -141,7 +117,7 @@ Subject: kill GCM
tools:ignore="ExportedService" />
--- a/chrome/android/java/src/org/chromium/chrome/browser/background_task_scheduler/ChromeBackgroundTaskFactory.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/background_task_scheduler/ChromeBackgroundTaskFactory.java
@@ -20,7 +20,6 @@ import org.chromium.chrome.browser.offli
@@ -18,7 +18,6 @@ import org.chromium.chrome.browser.offli
import org.chromium.chrome.browser.offlinepages.prefetch.OfflineNotificationBackgroundTask;
import org.chromium.chrome.browser.offlinepages.prefetch.PrefetchBackgroundTask;
import org.chromium.chrome.browser.omaha.OmahaService;
@ -149,7 +125,7 @@ Subject: kill GCM
import org.chromium.chrome.browser.webapps.WebApkUpdateTask;
import org.chromium.components.background_task_scheduler.BackgroundTask;
import org.chromium.components.background_task_scheduler.BackgroundTaskFactory;
@@ -60,8 +59,6 @@ public class ChromeBackgroundTaskFactory
@@ -59,8 +58,6 @@ public class ChromeBackgroundTaskFactory
switch (taskId) {
case TaskIds.OMAHA_JOB_ID:
return new OmahaService();
@ -168,16 +144,6 @@ Subject: kill GCM
return false;
}
--- a/components/gcm_driver/android/BUILD.gn
+++ b/components/gcm_driver/android/BUILD.gn
@@ -15,7 +15,6 @@ android_library("gcm_driver_java") {
"//content/public/android:content_java",
"//third_party/android_deps:androidx_annotation_annotation_java",
"//third_party/android_deps:com_google_code_findbugs_jsr305_java",
- "//third_party/android_sdk:android_gcm_java",
]
annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ]
--- a/components/gcm_driver/instance_id/android/BUILD.gn
+++ b/components/gcm_driver/instance_id/android/BUILD.gn
@@ -28,7 +28,6 @@ android_library("instance_id_driver_java
@ -291,16 +257,6 @@ Subject: kill GCM
return doBackgroundWork();
}
@Override
--- a/components/sync/android/BUILD.gn
+++ b/components/sync/android/BUILD.gn
@@ -13,7 +13,6 @@ android_library("sync_java") {
"//net/android:net_java",
"//third_party/android_deps:androidx_annotation_annotation_java",
"//third_party/android_deps:com_google_code_findbugs_jsr305_java",
- "//third_party/android_sdk:android_gcm_java",
]
annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ]
srcjar_deps = [ ":java_enums" ]
--- a/components/background_task_scheduler/internal/android/java/src/org/chromium/components/background_task_scheduler/internal/BackgroundTaskGcmTaskService.java
+++ b/components/background_task_scheduler/internal/android/java/src/org/chromium/components/background_task_scheduler/internal/BackgroundTaskGcmTaskService.java
@@ -8,10 +8,6 @@ import android.os.Build;


+ 1
- 1
patches/Unobtainium/kill-Location-fall-back-to-system.patch View File

@ -9,7 +9,7 @@ Subject: kill Location, fall back to system
--- a/services/device/geolocation/BUILD.gn
+++ b/services/device/geolocation/BUILD.gn
@@ -152,7 +152,6 @@ if (is_android) {
@@ -153,7 +153,6 @@ if (is_android) {
"android/java/src/org/chromium/device/geolocation/LocationProviderAdapter.java",
"android/java/src/org/chromium/device/geolocation/LocationProviderAndroid.java",
"android/java/src/org/chromium/device/geolocation/LocationProviderFactory.java",


+ 1
- 1
patches/Unobtainium/kill-Translate.patch View File

@ -29,7 +29,7 @@ Subject: kill Translate
boolean notifyAdapter = false;
// An optional Data Saver page.
if (mFreProperties.getBoolean(SHOW_DATA_REDUCTION_PAGE)) {
@@ -610,4 +616,9 @@ public class FirstRunActivity extends Fi
@@ -605,4 +611,9 @@ public class FirstRunActivity extends Fi
assert sObserver == null;
sObserver = observer;
}


+ 1
- 1
patches/Vanadium/0003-switch-to-fstack-protector-strong.patch View File

@ -9,7 +9,7 @@ Subject: [PATCH 03/73] switch to -fstack-protector-strong
--- a/build/config/compiler/BUILD.gn
+++ b/build/config/compiler/BUILD.gn
@@ -294,16 +294,12 @@ config("compiler") {
@@ -302,16 +302,12 @@ config("compiler") {
cflags += [ "-fstack-protector" ]
}
} else if ((is_posix && !is_chromeos_ash && !is_nacl) || is_fuchsia) {


+ 1
- 1
patches/Vanadium/0016-disable-seed-based-field-trials.patch View File

@ -9,7 +9,7 @@ Subject: [PATCH 16/73] disable seed-based field trials
--- a/components/variations/service/variations_field_trial_creator.cc
+++ b/components/variations/service/variations_field_trial_creator.cc
@@ -524,8 +524,6 @@ bool VariationsFieldTrialCreator::SetupF
@@ -533,8 +533,6 @@ bool VariationsFieldTrialCreator::SetupF
#endif // BUILDFLAG(FIELDTRIAL_TESTING_ENABLED)
bool used_seed = false;
if (!used_testing_config) {


+ 1
- 1
patches/Vanadium/0031-disable-media-router-media-remoting-by-default.patch View File

@ -9,7 +9,7 @@ Subject: [PATCH 31/73] disable media router media remoting by default
--- a/chrome/browser/profiles/profile.cc
+++ b/chrome/browser/profiles/profile.cc
@@ -327,7 +327,7 @@ void Profile::RegisterProfilePrefs(user_
@@ -323,7 +323,7 @@ void Profile::RegisterProfilePrefs(user_
media_router::prefs::kMediaRouterEnableCloudServices, false,
user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
registry->RegisterBooleanPref(


+ 3
- 3
patches/Vanadium/0032-disable-media-router-by-default.patch View File

@ -10,7 +10,7 @@ Subject: [PATCH 32/73] disable media router by default
--- a/chrome/browser/media/router/media_router_feature.cc
+++ b/chrome/browser/media/router/media_router_feature.cc
@@ -59,7 +59,7 @@ const PrefService::Preference* GetMediaR
@@ -56,7 +56,7 @@ const PrefService::Preference* GetMediaR
content::BrowserContext* context) {
return user_prefs::UserPrefs::Get(context)->FindPreference(
::prefs::kEnableMediaRouter);
@ -19,7 +19,7 @@ Subject: [PATCH 32/73] disable media router by default
} // namespace
#endif // defined(OS_ANDROID) || BUILDFLAG(ENABLE_EXTENSIONS)
@@ -80,18 +80,16 @@ bool MediaRouterEnabled(content::Browser
@@ -77,18 +77,16 @@ bool MediaRouterEnabled(content::Browser
if (it != stored_pref_values->end())
return it->second;
@ -48,7 +48,7 @@ Subject: [PATCH 32/73] disable media router by default
#endif // defined(OS_ANDROID) || BUILDFLAG(ENABLE_EXTENSIONS)
--- a/chrome/browser/profiles/profile_impl.cc
+++ b/chrome/browser/profiles/profile_impl.cc
@@ -454,7 +454,7 @@ void ProfileImpl::RegisterProfilePrefs(
@@ -447,7 +447,7 @@ void ProfileImpl::RegisterProfilePrefs(
#endif
registry->RegisterBooleanPref(prefs::kForceEphemeralProfiles, false);


+ 1
- 1
patches/series View File

@ -20,7 +20,6 @@ Unobtainium/kill-Vision.patch
Unobtainium/kill-Translate.patch
Unobtainium/kill-TOS-and-metrics-opt-out.patch
ungoogled-chromium-android/Change-package-name-chromium.patch
ungoogled-chromium-android/Remove-dependency-on-com.google.android.gcm.patch
ungoogled-chromium-android/Remove-dependency-on-com.google.android.gms.gcm.patch
ungoogled-chromium-android/Remove-dependency-on-com.google.android.gms.auth.patch
ungoogled-chromium-android/Remove-dependency-on-com.google.android.gms.cast.patch
@ -44,6 +43,7 @@ ungoogled-chromium-android/Remove-ntp-sites.patch
ungoogled-chromium-android/Add-save-data-flag.patch
ungoogled-chromium-android/Add-always-desktop-option.patch
ungoogled-chromium-android/Add-force-tablet-ui-option.patch
ungoogled-chromium-android/Disable-tflite.patch
Bromite/Remove-account-permissions-from-manifest.patch
Bromite/updater-disable-updater-pings.patch
Bromite/Change-default-webRTC-policy-to-not-use-any-address.patch


+ 18
- 19
patches/src-fix/fix-prefs.patch View File

@ -3,14 +3,14 @@ Date: Thu, 20 Feb 2020 22:24:35 -0500
Subject: fix build error with prefs.h
---
chrome/android/java/src/org/chromium/chrome/browser/signin/SigninFragmentBase.java | 3 +--
chrome/android/java/src/org/chromium/chrome/browser/signin/SigninPromoUtil.java | 4 +---
chrome/browser/preferences/BUILD.gn | 1 -
3 files changed, 2 insertions(+), 6 deletions(-)
chrome/android/java/src/org/chromium/chrome/browser/signin/SigninFragmentBase.java | 3 +--
chrome/browser/preferences/BUILD.gn | 1 -
chrome/browser/signin/ui/android/java/src/org/chromium/chrome/browser/signin/ui/SigninPromoUtil.java | 3 +--
3 files changed, 2 insertions(+), 5 deletions(-)
--- a/chrome/android/java/src/org/chromium/chrome/browser/signin/SigninFragmentBase.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/signin/SigninFragmentBase.java
@@ -438,8 +438,7 @@ public abstract class SigninFragmentBase
@@ -443,8 +443,7 @@ public abstract class SigninFragmentBase
private void runStateMachineAndSignin(boolean settingsClicked) {
mConfirmSyncDataStateMachine = new ConfirmSyncDataStateMachine(
new ConfirmSyncDataStateMachineDelegate(getChildFragmentManager()),
@ -20,22 +20,9 @@ Subject: fix build error with prefs.h
mSelectedAccountName, new ConfirmSyncDataStateMachine.Listener() {
@Override
public void onConfirm(boolean wipeData) {
--- a/chrome/android/java/src/org/chromium/chrome/browser/signin/SigninPromoUtil.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/signin/SigninPromoUtil.java
@@ -59,9 +59,7 @@ public class SigninPromoUtil {
boolean isSignedIn = IdentityServicesProvider.get()
.getIdentityManager(Profile.getLastUsedRegularProfile())
.hasPrimaryAccount();
- boolean wasSignedIn =
- TextUtils.isEmpty(UserPrefs.get(Profile.getLastUsedRegularProfile())
- .getString(Pref.GOOGLE_SERVICES_LAST_USERNAME));
+ boolean wasSignedIn = true;
Set<String> accountNames = new ArraySet<>(AccountUtils.toAccountNames(
AccountManagerFacadeProvider.getInstance().tryGetGoogleAccounts()));
if (!shouldLaunchSigninPromo(preferencesManager, currentMajorVersion, isSignedIn,
--- a/chrome/browser/preferences/BUILD.gn
+++ b/chrome/browser/preferences/BUILD.gn
@@ -36,7 +36,6 @@ java_cpp_strings("java_pref_names_srcjar
@@ -37,7 +37,6 @@ java_cpp_strings("java_pref_names_srcjar
"//components/offline_pages/core/prefetch/prefetch_prefs.cc",
"//components/password_manager/core/common/password_manager_pref_names.cc",
"//components/payments/core/payment_prefs.cc",
@ -43,3 +30,15 @@ Subject: fix build error with prefs.h
"//components/translate/core/browser/translate_pref_names.cc",
]
--- a/chrome/browser/signin/ui/android/java/src/org/chromium/chrome/browser/signin/ui/SigninPromoUtil.java
+++ b/chrome/browser/signin/ui/android/java/src/org/chromium/chrome/browser/signin/ui/SigninPromoUtil.java
@@ -53,8 +53,7 @@ public final class SigninPromoUtil {
SigninPreferencesManager preferencesManager = SigninPreferencesManager.getInstance();
int currentMajorVersion = ChromeVersionInfo.getProductMajorVersion();
boolean wasSignedIn =
- TextUtils.isEmpty(UserPrefs.get(Profile.getLastUsedRegularProfile())
- .getString(Pref.GOOGLE_SERVICES_LAST_USERNAME));
+ true;
if (!shouldLaunchSigninPromo(preferencesManager, currentMajorVersion, wasSignedIn)) {
return false;
}

+ 84
- 60
patches/src-fix/fix-safe-browsing-prefs.patch View File

@ -22,9 +22,9 @@ Subject: Fix build error caused by the removal of safe_browsing_prefs.h
chrome/browser/safe_browsing/android/java/src/org/chromium/chrome/browser/safe_browsing/settings/RadioButtonGroupSafeBrowsingPreference.java | 37 -
chrome/browser/safe_browsing/android/java/src/org/chromium/chrome/browser/safe_browsing/settings/SafeBrowsingSettingsFragment.java | 170 --------
chrome/browser/safe_browsing/android/java/src/org/chromium/chrome/browser/safe_browsing/settings/StandardProtectionSettingsFragment.java | 8
components/safe_browsing/content/browser/client_side_detection_host.cc | 9
components/safe_browsing/content/browser/client_side_detection_host.cc | 5
components/safe_browsing/content/browser/client_side_detection_host.h | 2
components/safe_browsing/content/browser/client_side_detection_service.cc | 23 -
components/safe_browsing/content/browser/client_side_detection_service.cc | 29 -
components/safe_browsing/core/features.cc | 2
weblayer/browser/browser_context_impl.cc | 2
weblayer/browser/browser_process.cc | 11
@ -32,16 +32,16 @@ Subject: Fix build error caused by the removal of safe_browsing_prefs.h
weblayer/browser/browsing_data_remover_delegate.cc | 2
weblayer/browser/content_browser_client_impl.cc | 18
weblayer/browser/profile_impl.cc | 16
weblayer/browser/safe_browsing/client_side_detection_service_delegate.cc | 2
weblayer/browser/safe_browsing/client_side_detection_service_delegate.cc | 12
weblayer/browser/safe_browsing/safe_browsing_blocking_page.cc | 8
weblayer/browser/safe_browsing/safe_browsing_service.cc | 200 ----------
weblayer/browser/safe_browsing/safe_browsing_tab_observer.cc | 11
weblayer/browser/subresource_filter_client_impl.cc | 2
34 files changed, 69 insertions(+), 593 deletions(-)
34 files changed, 67 insertions(+), 607 deletions(-)
--- a/chrome/android/BUILD.gn
+++ b/chrome/android/BUILD.gn
@@ -332,7 +332,6 @@ android_library("chrome_java") {
@@ -340,7 +340,6 @@ android_library("chrome_java") {
"//chrome/browser/privacy:java",
"//chrome/browser/privacy_sandbox/android:java",
"//chrome/browser/profiles/android:java",
@ -51,7 +51,7 @@ Subject: Fix build error caused by the removal of safe_browsing_prefs.h
"//chrome/browser/share:java",
--- a/android_webview/browser/aw_browser_context.cc
+++ b/android_webview/browser/aw_browser_context.cc
@@ -235,7 +235,7 @@ base::FilePath AwBrowserContext::GetCont
@@ -236,7 +236,7 @@ base::FilePath AwBrowserContext::GetCont
// static
void AwBrowserContext::RegisterPrefs(PrefRegistrySimple* registry) {
@ -68,9 +68,9 @@ Subject: Fix build error caused by the removal of safe_browsing_prefs.h
#include "components/safe_browsing/content/browser/threat_details.h"
-#include "components/safe_browsing/core/common/safe_browsing_prefs.h"
#include "components/safe_browsing/core/common/safebrowsing_constants.h"
#include "components/safe_browsing/core/common/utils.h"
#include "components/safe_browsing/core/features.h"
#include "components/safe_browsing/core/triggers/trigger_manager.h"
@@ -105,16 +104,16 @@ AwSafeBrowsingBlockingPage* AwSafeBrowsi
@@ -111,16 +110,16 @@ AwSafeBrowsingBlockingPage* AwSafeBrowsi
BaseSafeBrowsingErrorUI::SBErrorDisplayOptions display_options =
BaseSafeBrowsingErrorUI::SBErrorDisplayOptions(
IsMainPageLoadBlocked(unsafe_resources),
@ -103,7 +103,7 @@ Subject: Fix build error caused by the removal of safe_browsing_prefs.h
import org.chromium.chrome.browser.settings.ChromeManagedPreferenceDelegate;
import org.chromium.chrome.browser.settings.SettingsActivity;
import org.chromium.chrome.browser.signin.services.IdentityServicesProvider;
@@ -394,18 +393,10 @@ public class SyncAndServicesSettings ext
@@ -400,18 +399,10 @@ public class SyncAndServicesSettings ext
} else if (PREF_SEARCH_SUGGESTIONS.equals(key)) {
mPrefService.setBoolean(Pref.SEARCH_SUGGEST_ENABLED, (boolean) newValue);
} else if (PREF_SAFE_BROWSING.equals(key)) {
@ -122,7 +122,7 @@ Subject: Fix build error caused by the removal of safe_browsing_prefs.h
} else if (PREF_NAVIGATION_ERROR.equals(key)) {
mPrefService.setBoolean(Pref.ALTERNATE_ERROR_PAGES_ENABLED, (boolean) newValue);
} else if (PREF_USAGE_AND_CRASH_REPORTING.equals(key)) {
@@ -586,8 +577,6 @@ public class SyncAndServicesSettings ext
@@ -592,8 +583,6 @@ public class SyncAndServicesSettings ext
mSearchSuggestions.setChecked(mPrefService.getBoolean(Pref.SEARCH_SUGGEST_ENABLED));
mNavigationError.setChecked(mPrefService.getBoolean(Pref.ALTERNATE_ERROR_PAGES_ENABLED));
if (!mIsSafeBrowsingPreferenceRemoved) {
@ -131,7 +131,7 @@ Subject: Fix build error caused by the removal of safe_browsing_prefs.h
}
mUsageAndCrashReporting.setChecked(
@@ -657,10 +646,9 @@ public class SyncAndServicesSettings ext
@@ -663,10 +652,9 @@ public class SyncAndServicesSettings ext
*/
private void updateLeakDetectionAndSafeBrowsingReportingPreferences() {
assert !mIsSafeBrowsingPreferenceRemoved;
@ -144,7 +144,7 @@ Subject: Fix build error caused by the removal of safe_browsing_prefs.h
boolean has_token_for_leak_check = PasswordUIView.hasAccountForLeakCheckRequest();
boolean leak_detection_enabled =
@@ -688,10 +676,10 @@ public class SyncAndServicesSettings ext
@@ -694,10 +682,10 @@ public class SyncAndServicesSettings ext
return mPrefService.isManagedPreference(Pref.SEARCH_SUGGEST_ENABLED);
}
if (PREF_SAFE_BROWSING_SCOUT_REPORTING.equals(key)) {
@ -185,7 +185,7 @@ Subject: Fix build error caused by the removal of safe_browsing_prefs.h
import org.chromium.chrome.browser.settings.ChromeManagedPreferenceDelegate;
import org.chromium.chrome.browser.signin.services.IdentityServicesProvider;
import org.chromium.chrome.browser.signin.services.SigninManager;
@@ -218,7 +217,6 @@ public class GoogleServicesSettings
@@ -219,7 +218,6 @@ public class GoogleServicesSettings
identityManager.getPrimaryAccountInfo(ConsentLevel.NOT_REQUIRED) != null
&& !((boolean) newValue);
if (!shouldSignUserOut) {
@ -193,7 +193,7 @@ Subject: Fix build error caused by the removal of safe_browsing_prefs.h
return true;
}
@@ -229,7 +227,6 @@ public class GoogleServicesSettings
@@ -230,7 +228,6 @@ public class GoogleServicesSettings
IdentityServicesProvider.get()
.getSigninManager(Profile.getLastUsedRegularProfile())
.signOut(SignoutReason.USER_CLICKED_SIGNOUT_SETTINGS, null, false);
@ -201,7 +201,7 @@ Subject: Fix build error caused by the removal of safe_browsing_prefs.h
return true;
}
@@ -242,19 +239,9 @@ public class GoogleServicesSettings
@@ -243,19 +240,9 @@ public class GoogleServicesSettings
return false;
} else if (PREF_SEARCH_SUGGESTIONS.equals(key)) {
mPrefService.setBoolean(Pref.SEARCH_SUGGEST_ENABLED, (boolean) newValue);
@ -221,7 +221,7 @@ Subject: Fix build error caused by the removal of safe_browsing_prefs.h
} else if (PREF_NAVIGATION_ERROR.equals(key)) {
mPrefService.setBoolean(Pref.ALTERNATE_ERROR_PAGES_ENABLED, (boolean) newValue);
} else if (PREF_USAGE_AND_CRASH_REPORTING.equals(key)) {
@@ -274,13 +261,8 @@ public class GoogleServicesSettings
@@ -275,13 +262,8 @@ public class GoogleServicesSettings
}
private void updatePreferences() {
@ -235,7 +235,7 @@ Subject: Fix build error caused by the removal of safe_browsing_prefs.h
mUsageAndCrashReporting.setChecked(
mPrivacyPrefManager.isUsageAndCrashReportingPermittedByUser());
@@ -305,10 +287,9 @@ public class GoogleServicesSettings
@@ -306,10 +288,9 @@ public class GoogleServicesSettings
*/
private void updateLeakDetectionAndSafeBrowsingReportingPreferences() {
assert !mIsSecurityPreferenceRemoved;
@ -248,7 +248,7 @@ Subject: Fix build error caused by the removal of safe_browsing_prefs.h
boolean has_token_for_leak_check = PasswordUIView.hasAccountForLeakCheckRequest();
boolean leak_detection_enabled =
@@ -330,7 +311,7 @@ public class GoogleServicesSettings
@@ -331,7 +312,7 @@ public class GoogleServicesSettings
return preference -> {
String key = preference.getKey();
if (PREF_ALLOW_SIGNIN.equals(key)) {
@ -257,7 +257,7 @@ Subject: Fix build error caused by the removal of safe_browsing_prefs.h
}
if (PREF_NAVIGATION_ERROR.equals(key)) {
return mPrefService.isManagedPreference(Pref.ALTERNATE_ERROR_PAGES_ENABLED);
@@ -339,10 +320,10 @@ public class GoogleServicesSettings
@@ -340,10 +321,10 @@ public class GoogleServicesSettings
return mPrefService.isManagedPreference(Pref.SEARCH_SUGGEST_ENABLED);
}
if (PREF_SAFE_BROWSING_SCOUT_REPORTING.equals(key)) {
@ -270,7 +270,7 @@ Subject: Fix build error caused by the removal of safe_browsing_prefs.h
}
if (PREF_PASSWORD_LEAK_DETECTION.equals(key)) {
return mPrefService.isManagedPreference(Pref.PASSWORD_LEAK_DETECTION_ENABLED);
@@ -408,7 +389,6 @@ public class GoogleServicesSettings
@@ -407,7 +388,6 @@ public class GoogleServicesSettings
}
},
forceWipeUserData);
@ -280,8 +280,8 @@ Subject: Fix build error caused by the removal of safe_browsing_prefs.h
}
--- a/chrome/browser/safe_browsing/BUILD.gn
+++ b/chrome/browser/safe_browsing/BUILD.gn
@@ -296,7 +296,6 @@ static_library("safe_browsing") {
]
@@ -342,7 +342,6 @@ static_library("safe_browsing") {
deps += [ "//components/safe_browsing/android:remote_database_manager" ]
}
deps += [
- "//chrome/browser/safe_browsing/android",
@ -290,7 +290,7 @@ Subject: Fix build error caused by the removal of safe_browsing_prefs.h
]
--- a/chrome/browser/preferences/BUILD.gn
+++ b/chrome/browser/preferences/BUILD.gn
@@ -36,7 +36,6 @@ java_cpp_strings("java_pref_names_srcjar
@@ -37,7 +37,6 @@ java_cpp_strings("java_pref_names_srcjar
"//components/offline_pages/core/prefetch/prefetch_prefs.cc",
"//components/password_manager/core/common/password_manager_pref_names.cc",
"//components/payments/core/payment_prefs.cc",
@ -300,7 +300,7 @@ Subject: Fix build error caused by the removal of safe_browsing_prefs.h
]
--- a/chrome/browser/android/tab_web_contents_delegate_android.cc
+++ b/chrome/browser/android/tab_web_contents_delegate_android.cc
@@ -172,8 +172,6 @@ void TabWebContentsDelegateAndroid::Port
@@ -171,8 +171,6 @@ void TabWebContentsDelegateAndroid::Port
InfoBarService::CreateForWebContents(portal_contents);
PrefsTabHelper::CreateForWebContents(portal_contents);
DataReductionProxyTabHelper::CreateForWebContents(portal_contents);
@ -311,7 +311,7 @@ Subject: Fix build error caused by the removal of safe_browsing_prefs.h
void TabWebContentsDelegateAndroid::RunFileChooser(
--- a/weblayer/browser/content_browser_client_impl.cc
+++ b/weblayer/browser/content_browser_client_impl.cc
@@ -409,8 +409,7 @@ ContentBrowserClientImpl::CreateURLLoade
@@ -492,8 +492,7 @@ ContentBrowserClientImpl::CreateURLLoade
#if defined(OS_ANDROID)
BrowserContextImpl* browser_context_impl =
static_cast<BrowserContextImpl*>(browser_context);
@ -321,7 +321,7 @@ Subject: Fix build error caused by the removal of safe_browsing_prefs.h
if (is_safe_browsing_enabled) {
bool is_real_time_lookup_enabled =
@@ -732,16 +731,6 @@ ContentBrowserClientImpl::CreateThrottle
@@ -815,16 +814,6 @@ ContentBrowserClientImpl::CreateThrottle
#if defined(OS_ANDROID)
if (handle->IsInMainFrame()) {
@ -338,7 +338,7 @@ Subject: Fix build error caused by the removal of safe_browsing_prefs.h
}
#endif
return throttles;
@@ -792,11 +781,6 @@ void ContentBrowserClientImpl::ExposeInt
@@ -885,11 +874,6 @@ void ContentBrowserClientImpl::ExposeInt
};
registry->AddInterface(base::BindRepeating(create_spellcheck_host),
content::GetUIThreadTaskRunner({}));
@ -352,7 +352,7 @@ Subject: Fix build error caused by the removal of safe_browsing_prefs.h
--- a/weblayer/browser/safe_browsing/safe_browsing_blocking_page.cc
+++ b/weblayer/browser/safe_browsing/safe_browsing_blocking_page.cc
@@ -56,12 +56,8 @@ SafeBrowsingBlockingPage* SafeBrowsingBl
@@ -62,12 +62,8 @@ SafeBrowsingBlockingPage* SafeBrowsingBl
security_interstitials::BaseSafeBrowsingErrorUI::SBErrorDisplayOptions
display_options =
BaseBlockingPage::CreateDefaultDisplayOptions(unsafe_resources);
@ -386,7 +386,7 @@ Subject: Fix build error caused by the removal of safe_browsing_prefs.h
#include "components/safe_browsing/core/realtime/url_lookup_service.h"
#include "content/public/browser/browser_context.h"
#include "content/public/browser/browser_task_traits.h"
@@ -57,10 +54,7 @@ void MaybeCreateSafeBrowsing(
@@ -58,10 +55,7 @@ void MaybeCreateSafeBrowsing(
if (!render_process_host)
return;
@ -398,7 +398,7 @@ Subject: Fix build error caused by the removal of safe_browsing_prefs.h
if (!is_safe_browsing_enabled)
return;
@@ -74,196 +68,4 @@ void MaybeCreateSafeBrowsing(
@@ -75,196 +69,4 @@ void MaybeCreateSafeBrowsing(
} // namespace
@ -605,7 +605,7 @@ Subject: Fix build error caused by the removal of safe_browsing_prefs.h
#include "components/unified_consent/pref_names.h"
#include "ui/gfx/android/java_bitmap.h"
#include "weblayer/browser/android/metrics/weblayer_metrics_service_client.h"
@@ -595,11 +594,6 @@ void ProfileImpl::SetBooleanSetting(Sett
@@ -594,11 +593,6 @@ void ProfileImpl::SetBooleanSetting(Sett
auto* pref_service = GetBrowserContext()->pref_service();
switch (type) {
case SettingType::BASIC_SAFE_BROWSING_ENABLED:
@ -617,7 +617,7 @@ Subject: Fix build error caused by the removal of safe_browsing_prefs.h
break;
case SettingType::UKM_ENABLED: {
#if defined(OS_ANDROID)
@@ -614,10 +608,6 @@ void ProfileImpl::SetBooleanSetting(Sett
@@ -613,10 +607,6 @@ void ProfileImpl::SetBooleanSetting(Sett
break;
}
case SettingType::EXTENDED_REPORTING_SAFE_BROWSING_ENABLED:
@ -628,7 +628,7 @@ Subject: Fix build error caused by the removal of safe_browsing_prefs.h
break;
case SettingType::REAL_TIME_SAFE_BROWSING_ENABLED:
#if defined(OS_ANDROID)
@@ -636,16 +626,12 @@ bool ProfileImpl::GetBooleanSetting(Sett
@@ -635,16 +625,12 @@ bool ProfileImpl::GetBooleanSetting(Sett
switch (type) {
case SettingType::BASIC_SAFE_BROWSING_ENABLED:
#if defined(OS_ANDROID)
@ -656,7 +656,7 @@ Subject: Fix build error caused by the removal of safe_browsing_prefs.h
- // Create and initialize safe_browsing_service on first get.
- // Note: Initialize() needs to happen on UI thread.
- safe_browsing_service_ =
- std::make_unique<SafeBrowsingService>(GetUserAgent());
- std::make_unique<SafeBrowsingService>(embedder_support::GetUserAgent());
- safe_browsing_service_->Initialize();
- }
- return safe_browsing_service_.get();
@ -908,7 +908,7 @@ Subject: Fix build error caused by the removal of safe_browsing_prefs.h
static boolean isPromoDismissedInSharedPreference() {
--- a/chrome/android/java/src/org/chromium/chrome/browser/sync/settings/SignInPreference.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/sync/settings/SignInPreference.java
@@ -127,11 +127,7 @@ public class SignInPreference
@@ -125,11 +125,7 @@ public class SignInPreference
.getSigninManager(Profile.getLastUsedRegularProfile())
.isSigninDisabledByPolicy()) {
// TODO(https://crbug.com/1133739): Clean up after revising isSigninDisabledByPolicy.
@ -945,16 +945,16 @@ Subject: Fix build error caused by the removal of safe_browsing_prefs.h
private void onPromoSeen() {
--- a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java
@@ -21,8 +21,6 @@ import org.chromium.chrome.browser.flags
import org.chromium.chrome.browser.preferences.Pref;
import org.chromium.chrome.browser.privacy.secure_dns.SecureDnsSettings;
@@ -24,8 +24,6 @@ import org.chromium.chrome.browser.priva
import org.chromium.chrome.browser.privacy_sandbox.PrivacySandboxReferrer;
import org.chromium.chrome.browser.privacy_sandbox.PrivacySandboxSettingsFragment;
import org.chromium.chrome.browser.profiles.Profile;
-import org.chromium.chrome.browser.safe_browsing.metrics.SettingsAccessPoint;
-import org.chromium.chrome.browser.safe_browsing.settings.SafeBrowsingSettingsFragment;
import org.chromium.chrome.browser.settings.ChromeManagedPreferenceDelegate;
import org.chromium.chrome.browser.settings.SettingsLauncherImpl;
import org.chromium.chrome.browser.signin.services.IdentityServicesProvider;
@@ -88,11 +86,7 @@ public class PrivacySettings
@@ -103,11 +101,7 @@ public class PrivacySettings
if (ChromeFeatureList.isEnabled(ChromeFeatureList.SAFE_BROWSING_SECTION_UI)) {
getActivity().setTitle(R.string.prefs_privacy_security);
Preference safeBrowsingPreference = findPreference(PREF_SAFE_BROWSING);
@ -966,7 +966,7 @@ Subject: Fix build error caused by the removal of safe_browsing_prefs.h
return false;
});
} else {