Fix merge issues [2/2]

e-set-app-name.patch

e-set-popular-sites.patch

e-enable-donottrack.patch

e-enable-search-suggestion.patch

e-share-search-engine.patch

e_async_dns_disable.patch

e-set-search-engines.patch

e-set-informations.patch

e-disable-autofill.patch

e-rebrand-translations.patch

e-fix-settings-crash-issue.patch

e-enable-custom-tabs-by-default.patch

Fix-About-Chrome-regression.patch

From ed623302a6b91263ea23f73b8e1d464cbb8eae74 Mon Sep 17 00:00:00 2001

From 25d7dd831c2a8ee7bfbdbb97e48db53921bc0521 Mon Sep 17 00:00:00 2001

From: root <root@e-builder.ralfhein.de>

Date: Mon, 11 Feb 2019 11:59:35 +0100

Subject: [PATCH 3/7] Disable Google Assistant in Chrome

Date: Mon, 20 Jan 2020 17:41:21 +0530

Subject: [PATCH] [PATCH 3/7] Disable Google Assistant in Chrome

---

 chrome/android/java/res/xml/main_preferences.xml             | 5 -----

 3 files changed, 2 insertions(+), 7 deletions(-)

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

index 55806c223988..7b035bae9799 100644

index a37116288623..3f7f6bc2c11b 100644

--- a/chrome/android/java/res/xml/main_preferences.xml

+++ b/chrome/android/java/res/xml/main_preferences.xml

@@ -30,11 +30,6 @@

         android:fragment="org.chromium.chrome.browser.preferences.NotificationsPreferences"

         android:key="notifications"

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/autofill_assistant/AutofillAssistantPreferences.java b/chrome/android/java/src/org/chromium/chrome/browser/preferences/autofill_assistant/AutofillAssistantPreferences.java

index 1aa27a6abe67..098691eb476f 100644

index 098691eb476f..1aa27a6abe67 100644

--- a/chrome/android/java/src/org/chromium/chrome/browser/preferences/autofill_assistant/AutofillAssistantPreferences.java

+++ b/chrome/android/java/src/org/chromium/chrome/browser/preferences/autofill_assistant/AutofillAssistantPreferences.java

@@ -48,7 +48,7 @@ public class AutofillAssistantPreferences extends PreferenceFragmentCompat {

         // (e.g. the switch will say "On" when it is really turned off), so .setChecked() should be

         // called after .addPreference()

         autofillAssistantSwitch.setChecked(ContextUtils.getAppSharedPreferences().getBoolean(

-                PREF_AUTOFILL_ASSISTANT_SWITCH, true));

+                PREF_AUTOFILL_ASSISTANT_SWITCH, false));

-                PREF_AUTOFILL_ASSISTANT_SWITCH, false));

+                PREF_AUTOFILL_ASSISTANT_SWITCH, true));

     }

     private Context getStyledContext() {

diff --git a/content/public/common/content_features.cc b/content/public/common/content_features.cc

index 47256984df1e..4b39102ee208 100644

index 18d8f0d822ef..9fb03340cac2 100644

--- a/content/public/common/content_features.cc

+++ b/content/public/common/content_features.cc

@@ -763,7 +763,7 @@ const base::Feature kBrowserUseDisplayThreadPriority{

@@ -760,7 +760,7 @@ const base::Feature kBrowserUseDisplayThreadPriority{

 // Autofill Accessibility in Android.

 // crbug.com/627860

 const base::Feature kAndroidAutofillAccessibility{

From 2e97eb2ff4522a5597a7a4181c9611a1c920a4f0 Mon Sep 17 00:00:00 2001

From 07538c0bb4e229c9f7655dab2366a88e7327c0f1 Mon Sep 17 00:00:00 2001

From: Sumit Pundir <pundirsumit11@gmail.com>

Date: Fri, 10 May 2019 00:12:37 +0530

Subject: [PATCH 6/7] Enable custom tabs by default

Date: Tue, 21 Jan 2020 00:03:37 +0530

Subject: [PATCH] [PATCH 6/7] Enable custom tabs by default

Signed-off-by: Sumit Pundir <pundirsumit11@gmail.com>

---

 chrome/android/java/res/xml/privacy_preferences.xml | 4 ++--

 1 file changed, 2 insertions(+), 2 deletions(-)

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

index 7649427ff6b4..4ee4daad7b38 100644

index 35b7f7620405..a5bdedf422ea 100644

--- a/chrome/android/java/res/xml/privacy_preferences.xml

+++ b/chrome/android/java/res/xml/privacy_preferences.xml

@@ -37,7 +37,7 @@

@@ -42,7 +42,7 @@

         android:key="allow_custom_tab_intents"

         android:title="@string/allow_custom_tab_intents_title"

         android:summary="@string/allow_custom_tab_intents_summary"

-        android:defaultValue="false" />

+        android:defaultValue="true" />

     <android.support.v7.preference.Preference

         android:key="contextual_search"

         android:title="@string/contextual_search_title"

@@ -51,6 +51,6 @@

     <org.chromium.chrome.browser.preferences.ChromeBaseCheckBoxPreference

         android:key="close_tabs_on_exit"

         android:title="@string/close_tabs_on_exit_title"

@@ -52,6 +52,6 @@

         android:key="clear_browsing_data"

         android:title="@string/clear_browsing_data_title"

         android:summary="@string/clear_browsing_data_summary"

From 30b7000ed77135717c617247f512c69522d59cd7 Mon Sep 17 00:00:00 2001

From: Romain HUNAULT <romain.hunault@e.email>

Date: Thu, 7 Feb 2019 10:36:22 +0100

Subject: [PATCH] Enable search suggestion by default

Date: Mon, 20 Jan 2020 12:42:41 +0530

Subject: [PATCH] [PATCH] Enable search suggestion by default

---

 chrome/browser/profiles/profile.cc | 2 +-

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

diff --git a/chrome/browser/profiles/profile.cc b/chrome/browser/profiles/profile.cc

index b180175c04aa..3fd661ddec89 100644

index b52d7e236ea6..a950ce56bd92 100644

--- a/chrome/browser/profiles/profile.cc

+++ b/chrome/browser/profiles/profile.cc

@@ -138,7 +138,7 @@ const char Profile::kProfileKey[] = "__PROFILE__";

@@ -149,7 +149,7 @@ const char Profile::kProfileKey[] = "__PROFILE__";

 void Profile::RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {

   registry->RegisterBooleanPref(

       prefs::kSearchSuggestEnabled,

-      false,

+      true,

       user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);

 #if defined(OS_ANDROID)

   registry->RegisterStringPref(

   registry->RegisterBooleanPref(prefs::kSessionExitedCleanly, true);

   registry->RegisterStringPref(prefs::kSessionExitType, std::string());

-- 

2.17.1

2.23.0