Resolve patches that are causing conflicts

From d2d99f75133cb9e291f45cda463d88ea6f5d057c Mon Sep 17 00:00:00 2001

From b22a39db25acbd8c23b2e7bc76d9748d132bd5db Mon Sep 17 00:00:00 2001

From: althafvly <althafvly@gmail.com>

Date: Fri, 26 Nov 2021 07:34:57 +0000

Subject: Browser: Enable do not track by default

Signed-off-by: Saalim Quadri <danascape@gmail.com>

---

 components/privacy_sandbox/tracking_protection_prefs.cc | 2 +-

 chrome/browser/ui/browser_ui_prefs.cc | 2 +-

 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/privacy_sandbox/tracking_protection_prefs.cc b/components/privacy_sandbox/tracking_protection_prefs.cc

index 998217e95defa..1286397c229c3 100644

--- a/components/privacy_sandbox/tracking_protection_prefs.cc

+++ b/components/privacy_sandbox/tracking_protection_prefs.cc

@@ -12,7 +12,7 @@ namespace privacy_sandbox::tracking_protection {

 void RegisterProfilePrefs(PrefRegistrySimple* registry) {

diff --git a/chrome/browser/ui/browser_ui_prefs.cc b/chrome/browser/ui/browser_ui_prefs.cc

index f15498ed705a3..bb11e46df10f6 100644

--- a/chrome/browser/ui/browser_ui_prefs.cc

+++ b/chrome/browser/ui/browser_ui_prefs.cc

@@ -139,7 +139,7 @@ void RegisterBrowserUserPrefs(user_prefs::PrefRegistrySyncable* registry) {

   registry->RegisterDictionaryPref(prefs::kBrowserWindowPlacementPopup);

   registry->RegisterDictionaryPref(prefs::kAppWindowPlacement);

   registry->RegisterBooleanPref(

-      prefs::kEnableDoNotTrack, false,

+      prefs::kEnableDoNotTrack, true,

       user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);

   registry->RegisterBooleanPref(

       prefs::kFingerprintingProtectionEnabled, true,

 #if !BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_ANDROID)

   registry->RegisterBooleanPref(prefs::kPrintPreviewUseSystemDefaultPrinter,

-- 

2.34.1

2.52.0

From 4217d19cc3f691dcf3d5d955a213e78bce69b590 Mon Sep 17 00:00:00 2001

From 955b40fb3e13391d88d5a3f6de0562851b00e83c Mon Sep 17 00:00:00 2001

From: Aayush Gupta <theimpulson@e.email>

Date: Fri, 26 Nov 2021 07:12:30 +0000

Subject: Browser: Rename strings to browser

Signed-off-by: Saalim Quadri <danascape@gmail.com>

---

 .../android/java/res/xml/about_chrome_preferences.xml  |  3 +++

 .../browser/about_settings/AboutChromeSettings.java    |  7 +++----

 .../browser/about_settings/AboutChromeSettings.java    |  6 +++---

 .../ui/android/strings/android_chrome_strings.grd      |  2 ++

 chrome/browser/ui/android/strings/foundation_e.grdp    | 10 ++++++++++

 4 files changed, 18 insertions(+), 4 deletions(-)

 4 files changed, 18 insertions(+), 3 deletions(-)

 create mode 100644 chrome/browser/ui/android/strings/foundation_e.grdp

diff --git a/chrome/android/java/res/xml/about_chrome_preferences.xml b/chrome/android/java/res/xml/about_chrome_preferences.xml

         android:key="application_version"

         android:title="@string/application_version_title" />

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/about_settings/AboutChromeSettings.java b/chrome/android/java/src/org/chromium/chrome/browser/about_settings/AboutChromeSettings.java

index d782e5552b417..0c8ff21049cfc 100644

index b4db43786e475..6930f0e13e00c 100644

--- a/chrome/android/java/src/org/chromium/chrome/browser/about_settings/AboutChromeSettings.java

+++ b/chrome/android/java/src/org/chromium/chrome/browser/about_settings/AboutChromeSettings.java

@@ -37,7 +37,7 @@ public class AboutChromeSettings extends ChromeBaseSettingsFragment

@@ -43,7 +43,7 @@ public class AboutChromeSettings extends ChromeBaseSettingsFragment

     private static final String PREF_APPLICATION_VERSION = "application_version";

     private static final String PREF_OS_VERSION = "os_version";

     // Non-translated strings:

     @SuppressWarnings("InlineFormatString")

@@ -68,10 +68,9 @@ public class AboutChromeSettings extends ChromeBaseSettingsFragment

@@ -74,10 +74,10 @@ public class AboutChromeSettings extends ChromeBaseSettingsFragment

         p = findPreference(PREF_OS_VERSION);

         assumeNonNull(p);

         p.setSummary(AboutSettingsBridge.getOSVersion());

-        p = findPreference(PREF_LEGAL_INFORMATION);

+        p = findPreference(PREF_E_BROWSER_INFORMATION);

         assumeNonNull(p);

-        int currentYear = Calendar.getInstance().get(Calendar.YEAR);

         int currentYear = CalendarFactory.get().get(Calendar.YEAR);

-        p.setSummary(getString(R.string.legal_information_summary, currentYear));

+        p.setSummary(getString(R.string.e_browser_information));

     }

     @Override

diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd

index ae042b8744a52..05b98b2454274 100644

index 25af84522a4ec..71c9dc78f6e9f 100644

--- a/chrome/browser/ui/android/strings/android_chrome_strings.grd

+++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd

@@ -202,6 +202,8 @@ CHAR_LIMIT guidelines:

+  </message>

+</grit-part>

-- 

2.51.2

2.52.0

From 5eeebcb98cec6a5a146206087394dee0e17009ed Mon Sep 17 00:00:00 2001

From 124e354df096253b5718d16a6fe79bcd40ca7264 Mon Sep 17 00:00:00 2001

From: csagan5 <32685696+csagan5@users.noreply.github.com>

Date: Fri, 30 Mar 2018 10:09:03 +0200

Subject: Multiple fingerprinting mitigations

 create mode 100644 third_party/ungoogled/ungoogled_switches.h

diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn

index f5acf46010e85..fa4efe2e957d6 100644

index 6629a12bdba36..2461a051eea9f 100644

--- a/chrome/browser/BUILD.gn

+++ b/chrome/browser/BUILD.gn

@@ -2567,6 +2567,7 @@ static_library("browser") {

@@ -2554,6 +2554,7 @@ static_library("browser") {

     "//services/device/public/cpp/bluetooth",

     "//services/device/public/cpp/geolocation",

     "//services/device/public/cpp/usb",

     "//services/device/public/mojom:usb",

     "//services/image_annotation:service",

diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc

index 0ef29706d8144..ef0d82f5e97e1 100644

index 1fb089c208612..387b28436a1dd 100644

--- a/chrome/browser/about_flags.cc

+++ b/chrome/browser/about_flags.cc

@@ -268,6 +268,8 @@

@@ -267,6 +267,8 @@

 #include "ui/ui_features.h"

 #include "url/url_features.h"

 #include "base/android/pre_freeze_background_memory_trimmer.h"

 #include "chrome/browser/contextmenu/context_menu_features.h"

diff --git a/content/browser/BUILD.gn b/content/browser/BUILD.gn

index 548abd4a6857c..aae4a32f13862 100644

index 9910f4915c439..0d7f932f0f078 100644

--- a/content/browser/BUILD.gn

+++ b/content/browser/BUILD.gn

@@ -298,6 +298,7 @@ source_set("browser") {

@@ -296,6 +296,7 @@ source_set("browser") {

     "//third_party/re2",

     "//third_party/snappy",

     "//third_party/sqlite",

     "//third_party/zlib",

     "//tools/v8_context_snapshot:buildflags",

diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc

index 6190ba7b4bf74..49cb73485b933 100644

index ba7d2773cc53d..2cdd9f45bc601 100644

--- a/content/browser/renderer_host/render_process_host_impl.cc

+++ b/content/browser/renderer_host/render_process_host_impl.cc

@@ -222,6 +222,7 @@

@@ -221,6 +221,7 @@

 #include "url/gurl.h"

 #include "url/origin.h"

 #if BUILDFLAG(IS_ANDROID)

 #include "base/android/child_process_binding_types.h"

 #include "content/browser/font_unique_name_lookup/font_unique_name_lookup_service.h"

@@ -3665,6 +3666,8 @@ void RenderProcessHostImpl::PropagateBrowserCommandLineToRenderer(

@@ -3687,6 +3688,8 @@ void RenderProcessHostImpl::PropagateBrowserCommandLineToRenderer(

       switches::kDisableBestEffortTasks,

       switches::kDisableBreakpad,

       switches::kDisableFileSystem,

       switches::kDisableGpuMemoryBufferVideoFrames,

       switches::kDisableHistogramCustomizer,

diff --git a/content/child/BUILD.gn b/content/child/BUILD.gn

index 02c5836b0ffad..6bddb14544640 100644

index 8fc05220b2dc1..c27a70873a2b3 100644

--- a/content/child/BUILD.gn

+++ b/content/child/BUILD.gn

@@ -109,6 +109,7 @@ target(link_target_type, "child") {

     "//ui/base",

     "//ui/events/blink",

diff --git a/content/child/runtime_features.cc b/content/child/runtime_features.cc

index 000546b72b98c..30bc68f70a56f 100644

index 2dc082d5b9990..cc9f81d396f9b 100644

--- a/content/child/runtime_features.cc

+++ b/content/child/runtime_features.cc

@@ -50,6 +50,8 @@

   static void EnableFluentOverlayScrollbars(bool);

   static void EnableVibration(bool);

diff --git a/third_party/blink/renderer/core/dom/document.cc b/third_party/blink/renderer/core/dom/document.cc

index 10d5114316e9c..8375e22ce3c88 100644

index c3e8520590b77..388d060af39fc 100644

--- a/third_party/blink/renderer/core/dom/document.cc

+++ b/third_party/blink/renderer/core/dom/document.cc

@@ -41,6 +41,7 @@

 #include "base/task/single_thread_task_runner.h"

 #include "base/time/time.h"

 #include "base/trace_event/trace_event.h"

@@ -1089,6 +1090,16 @@ Document::Document(const DocumentInit& initializer,

@@ -1093,6 +1094,16 @@ Document::Document(const DocumentInit& initializer,

   TRACE_EVENT_WITH_FLOW0("blink", "Document::Document", TRACE_ID_LOCAL(this),

                          TRACE_EVENT_FLAG_FLOW_OUT);

   DCHECK(agent_);

   if (base::FeatureList::IsEnabled(features::kDelayAsyncScriptExecution) &&

       features::kDelayAsyncScriptExecutionDelayByDefaultParam.Get()) {

     script_runner_delayer_->Activate();

@@ -2816,6 +2827,14 @@ void Document::UpdateStyleAndLayoutTreeForThisDocument() {

@@ -2807,6 +2818,14 @@ void Document::UpdateStyleAndLayoutTreeForThisDocument() {

 #endif

 }

   DCHECK(IsActive());

   DCHECK(IsMainThread());

diff --git a/third_party/blink/renderer/core/dom/document.h b/third_party/blink/renderer/core/dom/document.h

index 8780a16c1d28b..56b08c3f1a3d2 100644

index 9aed206236759..bb5771556d18b 100644

--- a/third_party/blink/renderer/core/dom/document.h

+++ b/third_party/blink/renderer/core/dom/document.h

@@ -574,6 +574,10 @@ class CORE_EXPORT Document : public ContainerNode,

@@ -597,6 +597,10 @@ class CORE_EXPORT Document : public ContainerNode,

     has_xml_declaration_ = has_xml_declaration ? 1 : 0;

   }

   V8VisibilityState visibilityState() const;

   String visibilityStateAsString() const;

   bool IsPageVisible() const;

@@ -2810,6 +2814,9 @@ class CORE_EXPORT Document : public ContainerNode,

@@ -3055,6 +3059,9 @@ class CORE_EXPORT Document : public ContainerNode,

   base::ElapsedTimer start_time_;

   // - ScriptSchedulingType::kAsync

   // - ScriptSchedulingType::kInOrder

diff --git a/third_party/blink/renderer/core/html/canvas/canvas_async_blob_creator.cc b/third_party/blink/renderer/core/html/canvas/canvas_async_blob_creator.cc

index cec45ea050457..156af76a6e58c 100644

index adb616defbf32..2ee8cb37aa46d 100644

--- a/third_party/blink/renderer/core/html/canvas/canvas_async_blob_creator.cc

+++ b/third_party/blink/renderer/core/html/canvas/canvas_async_blob_creator.cc

@@ -22,6 +22,7 @@

@@ -17,6 +17,7 @@

 #include "third_party/blink/renderer/core/fileapi/blob.h"

 #include "third_party/blink/renderer/core/html/canvas/canvas_rendering_context.h"

 #include "third_party/blink/renderer/platform/graphics/image_data_buffer.h"

 #include "third_party/blink/renderer/platform/graphics/skia/skia_utils.h"

 #include "third_party/blink/renderer/platform/graphics/unaccelerated_static_bitmap_image.h"

 #include "third_party/blink/renderer/platform/heap/garbage_collected.h"

@@ -220,6 +221,9 @@ CanvasAsyncBlobCreator::CanvasAsyncBlobCreator(

@@ -207,6 +208,9 @@ CanvasAsyncBlobCreator::CanvasAsyncBlobCreator(

                            std::min(info.height(), max_dimension));

         src_data_.reset(info, src_data_.addr(), src_data_.rowBytes());

       }

   }

diff --git a/third_party/blink/renderer/core/html/canvas/text_metrics.cc b/third_party/blink/renderer/core/html/canvas/text_metrics.cc

index 4789cc78b4c47..e748b2b0f24a0 100644

index 0cc264052a4af..6ed636088026f 100644

--- a/third_party/blink/renderer/core/html/canvas/text_metrics.cc

+++ b/third_party/blink/renderer/core/html/canvas/text_metrics.cc

@@ -89,6 +89,24 @@ TextMetrics::TextMetrics(const Font* font,

   }

   return -1;

diff --git a/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.cc b/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.cc

index c85ea15a17907..3acfce25ed7a2 100644

index 0d8eb430d6a55..370fe4b401e77 100644

--- a/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.cc

+++ b/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.cc

@@ -103,6 +103,10 @@

@@ -99,6 +99,10 @@

 #include "third_party/blink/renderer/platform/wtf/text/wtf_string.h"

 #include "ui/gfx/geometry/skia_conversions.h"

 // Including "base/time/time.h" triggers a bug in IWYU.

 // https://github.com/include-what-you-use/include-what-you-use/issues/1122

 // IWYU pragma: no_include "base/numerics/clamped_math.h"

@@ -554,6 +558,10 @@ ImageData* BaseRenderingContext2D::getImageDataInternal(

@@ -523,6 +527,10 @@ ImageData* BaseRenderingContext2D::getImageDataInternal(

           snapshot->PaintImageForCurrentFrame().GetSkImageInfo().bounds();

       DCHECK(!bounds.intersect(SkIRect::MakeXYWH(sx, sy, sw, sh)));

     }

   }

   return image_data;

@@ -1233,9 +1241,23 @@ TextMetrics* BaseRenderingContext2D::measureText(const String& text) {

@@ -1170,9 +1178,23 @@ TextMetrics* BaseRenderingContext2D::measureText(const String& text) {

   TextDirection direction =

       ToTextDirection(state.GetDirection(), host, computed_style);

-  return MakeGarbageCollected<TextMetrics>(

+  auto* text_metrics = MakeGarbageCollected<TextMetrics>(

       font, direction, state.GetTextBaseline().AsEnum(),

       state.GetTextAlign().AsEnum(), text, host->GetPlainTextPainter());

       font, direction, state.GetTextBaseline(), state.GetTextAlign(), text,

       host->GetPlainTextPainter());

+  // Scale text metrics if enabled

+  if (RuntimeEnabledFeatures::FingerprintingCanvasMeasureTextNoiseEnabled()) {

+    OffscreenCanvas* offscreen_canvas = HostAsOffscreenCanvas();

 String BaseRenderingContext2D::lang() const {

diff --git a/third_party/blink/renderer/platform/BUILD.gn b/third_party/blink/renderer/platform/BUILD.gn

index d7a67479b6140..4e5967f763751 100644

index 49d07b1c0cbeb..71faf91fa8a65 100644

--- a/third_party/blink/renderer/platform/BUILD.gn

+++ b/third_party/blink/renderer/platform/BUILD.gn

@@ -1753,7 +1753,9 @@ component("platform") {

@@ -1752,7 +1752,9 @@ component("platform") {

     "//third_party/blink/renderer:non_test_config",

   ]

   allow_circular_includes_from = [

     "//third_party/blink/renderer/platform/blob",

@@ -1837,6 +1839,7 @@ component("platform") {

@@ -1836,6 +1838,7 @@ component("platform") {

     "//third_party/blink/public/strings",

     "//third_party/blink/renderer/platform/wtf",

     "//third_party/ced",

+

 }  // namespace blink

diff --git a/third_party/blink/renderer/platform/graphics/static_bitmap_image.h b/third_party/blink/renderer/platform/graphics/static_bitmap_image.h

index 3569ab7ee695e..41ce0df8031e6 100644

index 6e65d754528a2..10a395e32a125 100644

--- a/third_party/blink/renderer/platform/graphics/static_bitmap_image.h

+++ b/third_party/blink/renderer/platform/graphics/static_bitmap_image.h

@@ -38,6 +38,8 @@ class PLATFORM_EXPORT StaticBitmapImage : public Image {

   // Methods overridden by all sub-classes

diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 b/third_party/blink/renderer/platform/runtime_enabled_features.json5

index 59e4a9618b092..61c0e41e59bcf 100644

index c7e55d74ae7f9..05db5163ad3bc 100644

--- a/third_party/blink/renderer/platform/runtime_enabled_features.json5

+++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5

@@ -3467,6 +3467,12 @@

@@ -3566,6 +3566,12 @@

       status: {"Mac": "test", "default": "stable"},

       base_feature: "none",

     },