From 02dfbb43dccefdc6848ab6e6d122f7069af77f94 Mon Sep 17 00:00:00 2001
From: csagan5 <32685696+csagan5@users.noreply.github.com>
Date: Thu, 12 Oct 2017 08:16:19 +0200
Subject: [PATCH] Add other two patches from Ungoogled-chromium

---
 patches/privacy/disable-google-fonts.patch |  59 +++++
 patches/privacy/modify-default-prefs.patch | 238 +++++++++++++++++++++
 2 files changed, 297 insertions(+)
 create mode 100644 patches/privacy/disable-google-fonts.patch
 create mode 100644 patches/privacy/modify-default-prefs.patch

diff --git a/patches/privacy/disable-google-fonts.patch b/patches/privacy/disable-google-fonts.patch
new file mode 100644
index 00000000..c9c0be34
--- /dev/null
+++ b/patches/privacy/disable-google-fonts.patch
@@ -0,0 +1,59 @@
+commit a06e62ec32a189b8cd16266e47b386ebe00cc04c
+Author: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date:   Thu Oct 12 07:41:20 2017 +0200
+
+    Disables references to fonts.googleapis.com
+
+diff --git a/components/dom_distiller/content/browser/dom_distiller_viewer_source.cc b/components/dom_distiller/content/browser/dom_distiller_viewer_source.cc
+index bed7d31..cb8971f 100644
+--- a/components/dom_distiller/content/browser/dom_distiller_viewer_source.cc
++++ b/components/dom_distiller/content/browser/dom_distiller_viewer_source.cc
+@@ -309,7 +309,7 @@ bool DomDistillerViewerSource::ShouldServiceRequest(
+ 
+ std::string DomDistillerViewerSource::GetContentSecurityPolicyStyleSrc()
+     const {
+-  return "style-src 'self' https://fonts.googleapis.com;";
++  return "style-src 'self';";
+ }
+ 
+ std::string DomDistillerViewerSource::GetContentSecurityPolicyChildSrc() const {
+diff --git a/components/dom_distiller/core/html/preview.html b/components/dom_distiller/core/html/preview.html
+index a4c07c5..894eb7f 100644
+--- a/components/dom_distiller/core/html/preview.html
++++ b/components/dom_distiller/core/html/preview.html
+@@ -11,7 +11,7 @@ found in the LICENSE file.
+   <meta name="theme-color" id="theme-color">
+   <title>Title goes here and it could be kind of lengthy - Publisher name</title>
+   <link href="../css/distilledpage.css" rel="stylesheet" type="text/css">
+-  <link href='https://fonts.googleapis.com/css?family=Roboto' rel='stylesheet' type='text/css'>
++  <link href='chrome://resources/css/roboto.css' rel='stylesheet' type='text/css'>
+   <style>
+     .english :lang(th) {display: none}
+     .english :lang(zh) {display: none}
+diff --git a/components/dom_distiller/core/javascript/dom_distiller_viewer.js b/components/dom_distiller/core/javascript/dom_distiller_viewer.js
+index 61ef521..2640e3a 100644
+--- a/components/dom_distiller/core/javascript/dom_distiller_viewer.js
++++ b/components/dom_distiller/core/javascript/dom_distiller_viewer.js
+@@ -120,7 +120,7 @@ function maybeSetWebFont() {
+   if (distiller_on_ios) return;
+ 
+   var e = document.createElement('link');
+-  e.href = 'https://fonts.googleapis.com/css?family=Roboto';
++  e.href = 'chrome://resources/css/roboto.css';
+   e.rel = 'stylesheet';
+   e.type = 'text/css';
+   document.head.appendChild(e);
+diff --git a/third_party/crashpad/crashpad/doc/support/crashpad_doxygen.css b/third_party/crashpad/crashpad/doc/support/crashpad_doxygen.css
+index f21cfe9..b7a5d7a 100644
+--- a/third_party/crashpad/crashpad/doc/support/crashpad_doxygen.css
++++ b/third_party/crashpad/crashpad/doc/support/crashpad_doxygen.css
+@@ -12,8 +12,7 @@
+  * See the License for the specific language governing permissions and
+  * limitations under the License. */
+ 
+-@import "https://fonts.googleapis.com/css?family=Open+Sans:300,400,700&subset=latin,cyrillic-ext,greek-ext,cyrillic,greek,vietnamese,latin-ext";
+-@import "https://fonts.googleapis.com/css?family=Source+Code+Pro";
++@import "chrome://resources/css/roboto.css";
+ 
+ body,
+ table,
diff --git a/patches/privacy/modify-default-prefs.patch b/patches/privacy/modify-default-prefs.patch
new file mode 100644
index 00000000..3fc1336b
--- /dev/null
+++ b/patches/privacy/modify-default-prefs.patch
@@ -0,0 +1,238 @@
+commit ead3cfcf33af7b007ef266068e9c1a5a512200f4
+Author: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date:   Thu Oct 12 08:09:24 2017 +0200
+
+    Modify default preferences
+
+diff --git a/chrome/browser/background/background_mode_manager.cc b/chrome/browser/background/background_mode_manager.cc
+index 6b66f9e..ac44881 100644
+--- a/chrome/browser/background/background_mode_manager.cc
++++ b/chrome/browser/background/background_mode_manager.cc
+@@ -363,7 +363,7 @@ void BackgroundModeManager::RegisterPrefs(PrefRegistrySimple* registry) {
+   registry->RegisterBooleanPref(prefs::kChromeCreatedLoginItem, false);
+   registry->RegisterBooleanPref(prefs::kMigratedLoginItemPref, false);
+ #endif
+-  registry->RegisterBooleanPref(prefs::kBackgroundModeEnabled, true);
++  registry->RegisterBooleanPref(prefs::kBackgroundModeEnabled, false);
+ }
+ 
+ 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
+--- a/chrome/browser/chrome_content_browser_client.cc
++++ b/chrome/browser/chrome_content_browser_client.cc
+@@ -844,7 +844,7 @@ ChromeContentBrowserClient::~ChromeContentBrowserClient() {
+ void ChromeContentBrowserClient::RegisterProfilePrefs(
+     user_prefs::PrefRegistrySyncable* registry) {
+   registry->RegisterBooleanPref(prefs::kDisable3DAPIs, false);
+-  registry->RegisterBooleanPref(prefs::kEnableHyperlinkAuditing, true);
++  registry->RegisterBooleanPref(prefs::kEnableHyperlinkAuditing, false);
+   registry->RegisterListPref(prefs::kEnableDeprecatedWebPlatformFeatures);
+ }
+ 
+diff --git a/chrome/browser/io_thread.cc b/chrome/browser/io_thread.cc
+index 521f155..6fb04a9 100644
+--- a/chrome/browser/io_thread.cc
++++ b/chrome/browser/io_thread.cc
+@@ -610,7 +610,7 @@ void IOThread::RegisterPrefs(PrefRegistrySimple* registry) {
+                                std::string());
+   registry->RegisterBooleanPref(prefs::kEnableReferrers, true);
+   data_reduction_proxy::RegisterPrefs(registry);
+-  registry->RegisterBooleanPref(prefs::kBuiltInDnsClientEnabled, true);
++  registry->RegisterBooleanPref(prefs::kBuiltInDnsClientEnabled, false);
+   registry->RegisterBooleanPref(prefs::kQuickCheckEnabled, true);
+   registry->RegisterBooleanPref(prefs::kPacHttpsUrlStrippingEnabled, true);
+ }
+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
++++ b/chrome/browser/net/prediction_options.cc
+@@ -30,7 +30,7 @@ NetworkPredictionStatus CanPrefetchAndPrerender(
+         return NetworkPredictionStatus::ENABLED;
+       }
+     default:
+-      DCHECK_EQ(NETWORK_PREDICTION_NEVER, network_prediction_options);
++      //DCHECK_EQ(NETWORK_PREDICTION_NEVER, network_prediction_options);
+       return NetworkPredictionStatus::DISABLED_ALWAYS;
+   }
+ }
+diff --git a/chrome/browser/net/prediction_options.h b/chrome/browser/net/prediction_options.h
+index 6512483..4c55a19 100644
+--- a/chrome/browser/net/prediction_options.h
++++ b/chrome/browser/net/prediction_options.h
+@@ -23,7 +23,7 @@ enum NetworkPredictionOptions {
+   NETWORK_PREDICTION_ALWAYS,
+   NETWORK_PREDICTION_WIFI_ONLY,
+   NETWORK_PREDICTION_NEVER,
+-  NETWORK_PREDICTION_DEFAULT = NETWORK_PREDICTION_WIFI_ONLY,
++  NETWORK_PREDICTION_DEFAULT = NETWORK_PREDICTION_NEVER,
+ };
+ 
+ enum class NetworkPredictionStatus {
+diff --git a/chrome/browser/profiles/profile.cc b/chrome/browser/profiles/profile.cc
+index 9bfac12..243f176 100644
+--- a/chrome/browser/profiles/profile.cc
++++ b/chrome/browser/profiles/profile.cc
+@@ -136,7 +136,7 @@ const char Profile::kNoHostedDomainFound[] = "NO_HOSTED_DOMAIN";
+ void Profile::RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
+   registry->RegisterBooleanPref(
+       prefs::kSearchSuggestEnabled,
+-      true,
++      false,
+       user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
+ #if defined(OS_ANDROID)
+   registry->RegisterStringPref(
+diff --git a/chrome/browser/resources/settings/reset_page/reset_profile_dialog.html b/chrome/browser/resources/settings/reset_page/reset_profile_dialog.html
+index b46a992..9d353d9 100644
+--- a/chrome/browser/resources/settings/reset_page/reset_profile_dialog.html
++++ b/chrome/browser/resources/settings/reset_page/reset_profile_dialog.html
+@@ -45,7 +45,7 @@
+         </paper-button>
+       </div>
+       <div slot="footer">
+-        <paper-checkbox id="sendSettings" checked>
++        <paper-checkbox id="sendSettings">
+           $i18nRaw{resetPageFeedback}</paper-checkbox>
+       </div>
+     </dialog>
+diff --git a/chrome/browser/signin/signin_promo.cc b/chrome/browser/signin/signin_promo.cc
+index 01f0f66..e0ce4b1 100644
+--- a/chrome/browser/signin/signin_promo.cc
++++ b/chrome/browser/signin/signin_promo.cc
+@@ -329,8 +329,8 @@ void ForceWebBasedSigninFlowForTesting(bool force) {
+ void RegisterProfilePrefs(
+     user_prefs::PrefRegistrySyncable* registry) {
+   registry->RegisterIntegerPref(prefs::kSignInPromoStartupCount, 0);
+-  registry->RegisterBooleanPref(prefs::kSignInPromoUserSkipped, false);
+-  registry->RegisterBooleanPref(prefs::kSignInPromoShowOnFirstRunAllowed, true);
++  registry->RegisterBooleanPref(prefs::kSignInPromoUserSkipped, true);
++  registry->RegisterBooleanPref(prefs::kSignInPromoShowOnFirstRunAllowed, false);
+   registry->RegisterBooleanPref(prefs::kSignInPromoShowNTPBubble, false);
+ }
+ 
+diff --git a/chrome/browser/ui/browser_ui_prefs.cc b/chrome/browser/ui/browser_ui_prefs.cc
+index 79f4e19..946f7cd 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) {
+   registry->RegisterBooleanPref(prefs::kWebAppCreateInQuickLaunchBar, true);
+   registry->RegisterBooleanPref(
+       prefs::kEnableTranslate,
+-      true,
++      false,
+       user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
+   registry->RegisterStringPref(prefs::kCloudPrintEmail, std::string());
+   registry->RegisterBooleanPref(prefs::kCloudPrintProxyEnabled, true);
+-  registry->RegisterBooleanPref(prefs::kCloudPrintSubmitEnabled, true);
++  registry->RegisterBooleanPref(prefs::kCloudPrintSubmitEnabled, false);
+   registry->RegisterBooleanPref(prefs::kDevToolsDisabled, false);
+   registry->RegisterDictionaryPref(prefs::kBrowserWindowPlacement);
+   registry->RegisterDictionaryPref(prefs::kBrowserWindowPlacementPopup);
+diff --git a/chrome/browser/ui/navigation_correction_tab_observer.cc b/chrome/browser/ui/navigation_correction_tab_observer.cc
+index 887d681..60eea93 100644
+--- a/chrome/browser/ui/navigation_correction_tab_observer.cc
++++ b/chrome/browser/ui/navigation_correction_tab_observer.cc
+@@ -58,7 +58,7 @@ NavigationCorrectionTabObserver::~NavigationCorrectionTabObserver() {
+ void NavigationCorrectionTabObserver::RegisterProfilePrefs(
+     user_prefs::PrefRegistrySyncable* prefs) {
+   prefs->RegisterBooleanPref(prefs::kAlternateErrorPagesEnabled,
+-                             true,
++                             false,
+                              user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
+ }
+ 
+diff --git a/chrome/browser/ui/webui/local_discovery/local_discovery_ui.cc b/chrome/browser/ui/webui/local_discovery/local_discovery_ui.cc
+index 8d043bd..69aa9f4 100644
+--- a/chrome/browser/ui/webui/local_discovery/local_discovery_ui.cc
++++ b/chrome/browser/ui/webui/local_discovery/local_discovery_ui.cc
+@@ -143,10 +143,6 @@ void LocalDiscoveryUI::RegisterProfilePrefs(
+     user_prefs::PrefRegistrySyncable* registry) {
+   registry->RegisterBooleanPref(
+       prefs::kLocalDiscoveryNotificationsEnabled,
+-#if defined(OS_WIN)
+       false,
+-#else
+-      true,
+-#endif
+       user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
+ }
+diff --git a/chrome/service/cloud_print/connector_settings.cc b/chrome/service/cloud_print/connector_settings.cc
+index 83a4617..4b8511c 100644
+--- a/chrome/service/cloud_print/connector_settings.cc
++++ b/chrome/service/cloud_print/connector_settings.cc
+@@ -60,7 +60,7 @@ void ConnectorSettings::InitFrom(ServiceProcessPrefs* prefs) {
+   DCHECK(server_url_.is_valid());
+ 
+   connect_new_printers_ = prefs->GetBoolean(
+-      prefs::kCloudPrintConnectNewPrinters, true);
++      prefs::kCloudPrintConnectNewPrinters, false);
+ 
+   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
+--- a/components/autofill/core/browser/autofill_manager.cc
++++ b/components/autofill/core/browser/autofill_manager.cc
+@@ -274,7 +274,7 @@ void AutofillManager::RegisterProfilePrefs(
+   registry->RegisterIntegerPref(
+       prefs::kAutofillCreditCardSigninPromoImpressionCount, 0);
+   registry->RegisterBooleanPref(
+-      prefs::kAutofillEnabled, true,
++      prefs::kAutofillEnabled, false,
+       user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
+   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
+--- a/components/bookmarks/browser/bookmark_utils.cc
++++ b/components/bookmarks/browser/bookmark_utils.cc
+@@ -442,12 +442,12 @@ void GetBookmarksMatchingProperties(BookmarkModel* model,
+ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
+   registry->RegisterBooleanPref(
+       prefs::kShowBookmarkBar,
+-      false,
++      true,
+       user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
+   registry->RegisterBooleanPref(prefs::kEditBookmarksEnabled, true);
+   registry->RegisterBooleanPref(
+       prefs::kShowAppsShortcutInBookmarkBar,
+-      true,
++      false,
+       user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
+   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
+--- 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) {
+   registry->RegisterBooleanPref(
+       prefs::kSafeBrowsingSawInterstitialScoutReporting, false);
+   registry->RegisterBooleanPref(
+-      prefs::kSafeBrowsingExtendedReportingOptInAllowed, true);
++      prefs::kSafeBrowsingExtendedReportingOptInAllowed, false);
+   registry->RegisterBooleanPref(
+-      prefs::kSafeBrowsingEnabled, true,
++      prefs::kSafeBrowsingEnabled, false,
+       user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
+   registry->RegisterBooleanPref(prefs::kSafeBrowsingProceedAnywayDisabled,
+                                 false);
+diff --git a/extensions/common/extension.cc b/extensions/common/extension.cc
+index b8da726..b9ca9b0 100644
+--- a/extensions/common/extension.cc
++++ b/extensions/common/extension.cc
+@@ -344,14 +344,6 @@ bool Extension::ShouldDisplayInExtensionSettings() const {
+   if (is_theme())
+     return false;
+ 
+-  // Hide component extensions because they are only extensions as an
+-  // implementation detail of Chrome.
+-  if (extensions::Manifest::IsComponentLocation(location()) &&
+-      !base::CommandLine::ForCurrentProcess()->HasSwitch(
+-          switches::kShowComponentExtensionOptions)) {
+-    return false;
+-  }
+-
+   // Unless they are unpacked, never show hosted apps. Note: We intentionally
+   // show packaged apps and platform apps because there are some pieces of
+   // functionality that are only available in chrome://extensions/ but which