From b26461b55ff2cbe80298d02f698d02ebf543313d Mon Sep 17 00:00:00 2001
From: csagan5 <32685696+csagan5@users.noreply.github.com>
Date: Sun, 26 Nov 2017 11:06:20 +0100
Subject: [PATCH] Adapted patch to latest Chromium

---
 patches/privacy/modify-default-prefs.patch | 38 +++++++++++-----------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/patches/privacy/modify-default-prefs.patch b/patches/privacy/modify-default-prefs.patch
index 3fc1336b..f5793ebd 100644
--- a/patches/privacy/modify-default-prefs.patch
+++ b/patches/privacy/modify-default-prefs.patch
@@ -1,4 +1,4 @@
-commit ead3cfcf33af7b007ef266068e9c1a5a512200f4
+commit 3075d5cc23f69b42c80690162426ae2501cd2b5b
 Author: csagan5 <32685696+csagan5@users.noreply.github.com>
 Date:   Thu Oct 12 08:09:24 2017 +0200
 
@@ -18,10 +18,10 @@ index 6b66f9e..ac44881 100644
  
  void BackgroundModeManager::RegisterProfile(Profile* profile) {
 diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
-index 762dc0b..33e81b4 100644
+index a96f159e..7f7e9cf 100644
 --- a/chrome/browser/chrome_content_browser_client.cc
 +++ b/chrome/browser/chrome_content_browser_client.cc
-@@ -844,7 +844,7 @@ ChromeContentBrowserClient::~ChromeContentBrowserClient() {
+@@ -877,7 +877,7 @@ void ChromeContentBrowserClient::RegisterLocalStatePrefs(
  void ChromeContentBrowserClient::RegisterProfilePrefs(
      user_prefs::PrefRegistrySyncable* registry) {
    registry->RegisterBooleanPref(prefs::kDisable3DAPIs, false);
@@ -31,10 +31,10 @@ index 762dc0b..33e81b4 100644
  }
  
 diff --git a/chrome/browser/io_thread.cc b/chrome/browser/io_thread.cc
-index 521f155..6fb04a9 100644
+index e6ccce4..1e37c2b 100644
 --- a/chrome/browser/io_thread.cc
 +++ b/chrome/browser/io_thread.cc
-@@ -610,7 +610,7 @@ void IOThread::RegisterPrefs(PrefRegistrySimple* registry) {
+@@ -612,7 +612,7 @@ void IOThread::RegisterPrefs(PrefRegistrySimple* registry) {
                                 std::string());
    registry->RegisterBooleanPref(prefs::kEnableReferrers, true);
    data_reduction_proxy::RegisterPrefs(registry);
@@ -42,7 +42,7 @@ index 521f155..6fb04a9 100644
 +  registry->RegisterBooleanPref(prefs::kBuiltInDnsClientEnabled, false);
    registry->RegisterBooleanPref(prefs::kQuickCheckEnabled, true);
    registry->RegisterBooleanPref(prefs::kPacHttpsUrlStrippingEnabled, true);
- }
+ #if defined(OS_POSIX)
 diff --git a/chrome/browser/net/prediction_options.cc b/chrome/browser/net/prediction_options.cc
 index 8ab8a07..967bf2f 100644
 --- a/chrome/browser/net/prediction_options.cc
@@ -70,7 +70,7 @@ index 6512483..4c55a19 100644
  
  enum class NetworkPredictionStatus {
 diff --git a/chrome/browser/profiles/profile.cc b/chrome/browser/profiles/profile.cc
-index 9bfac12..243f176 100644
+index 52042ee..b1acb4a 100644
 --- a/chrome/browser/profiles/profile.cc
 +++ b/chrome/browser/profiles/profile.cc
 @@ -136,7 +136,7 @@ const char Profile::kNoHostedDomainFound[] = "NO_HOSTED_DOMAIN";
@@ -96,10 +96,10 @@ index b46a992..9d353d9 100644
        </div>
      </dialog>
 diff --git a/chrome/browser/signin/signin_promo.cc b/chrome/browser/signin/signin_promo.cc
-index 01f0f66..e0ce4b1 100644
+index 0f4bdb3..77e4810 100644
 --- a/chrome/browser/signin/signin_promo.cc
 +++ b/chrome/browser/signin/signin_promo.cc
-@@ -329,8 +329,8 @@ void ForceWebBasedSigninFlowForTesting(bool force) {
+@@ -371,8 +371,8 @@ void ForceWebBasedSigninFlowForTesting(bool force) {
  void RegisterProfilePrefs(
      user_prefs::PrefRegistrySyncable* registry) {
    registry->RegisterIntegerPref(prefs::kSignInPromoStartupCount, 0);
@@ -111,15 +111,15 @@ index 01f0f66..e0ce4b1 100644
  }
  
 diff --git a/chrome/browser/ui/browser_ui_prefs.cc b/chrome/browser/ui/browser_ui_prefs.cc
-index 79f4e19..946f7cd 100644
+index bcd4d0e..2302f0f 100644
 --- a/chrome/browser/ui/browser_ui_prefs.cc
 +++ b/chrome/browser/ui/browser_ui_prefs.cc
-@@ -62,11 +62,11 @@ void RegisterBrowserUserPrefs(user_prefs::PrefRegistrySyncable* registry) {
+@@ -59,11 +59,11 @@ void RegisterBrowserUserPrefs(user_prefs::PrefRegistrySyncable* registry) {
+   registry->RegisterBooleanPref(prefs::kWebAppCreateInAppsMenu, true);
    registry->RegisterBooleanPref(prefs::kWebAppCreateInQuickLaunchBar, true);
    registry->RegisterBooleanPref(
-       prefs::kEnableTranslate,
--      true,
-+      false,
+-      prefs::kOfferTranslateEnabled, true,
++      prefs::kOfferTranslateEnabled, false,
        user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
    registry->RegisterStringPref(prefs::kCloudPrintEmail, std::string());
    registry->RegisterBooleanPref(prefs::kCloudPrintProxyEnabled, true);
@@ -170,10 +170,10 @@ index 83a4617..4b8511c 100644
    xmpp_ping_enabled_ = prefs->GetBoolean(
        prefs::kCloudPrintXmppPingEnabled, false);
 diff --git a/components/autofill/core/browser/autofill_manager.cc b/components/autofill/core/browser/autofill_manager.cc
-index a0e6cae..10a49c3 100644
+index 9468cf2..86366ca 100644
 --- a/components/autofill/core/browser/autofill_manager.cc
 +++ b/components/autofill/core/browser/autofill_manager.cc
-@@ -274,7 +274,7 @@ void AutofillManager::RegisterProfilePrefs(
+@@ -211,7 +211,7 @@ void AutofillManager::RegisterProfilePrefs(
    registry->RegisterIntegerPref(
        prefs::kAutofillCreditCardSigninPromoImpressionCount, 0);
    registry->RegisterBooleanPref(
@@ -183,7 +183,7 @@ index a0e6cae..10a49c3 100644
    registry->RegisterBooleanPref(
        prefs::kAutofillProfileUseDatesFixed, false,
 diff --git a/components/bookmarks/browser/bookmark_utils.cc b/components/bookmarks/browser/bookmark_utils.cc
-index a0b9d39..ef0dd6b 100644
+index 8455e49..c7e70c0 100644
 --- a/components/bookmarks/browser/bookmark_utils.cc
 +++ b/components/bookmarks/browser/bookmark_utils.cc
 @@ -442,12 +442,12 @@ void GetBookmarksMatchingProperties(BookmarkModel* model,
@@ -202,10 +202,10 @@ index a0b9d39..ef0dd6b 100644
    registry->RegisterBooleanPref(
        prefs::kShowManagedBookmarksInBookmarkBar,
 diff --git a/components/safe_browsing/common/safe_browsing_prefs.cc b/components/safe_browsing/common/safe_browsing_prefs.cc
-index 2ebf20d..7866663 100644
+index a05123f..4b8b05cb 100644
 --- a/components/safe_browsing/common/safe_browsing_prefs.cc
 +++ b/components/safe_browsing/common/safe_browsing_prefs.cc
-@@ -372,9 +372,9 @@ void RegisterProfilePrefs(PrefRegistrySimple* registry) {
+@@ -343,9 +343,9 @@ void RegisterProfilePrefs(PrefRegistrySimple* registry) {
    registry->RegisterBooleanPref(
        prefs::kSafeBrowsingSawInterstitialScoutReporting, false);
    registry->RegisterBooleanPref(