From df72308ce82e51112a8f7cee5135437a3bf4dbbf Mon Sep 17 00:00:00 2001 From: Eloston Date: Sat, 10 Sep 2016 01:42:30 -0700 Subject: [PATCH] Update Inox and Iridium patches to Chrome 53 Update README.md --- README.md | 26 +- .../add-duckduckgo-search-engine.patch | 584 ++++++++++++++++++ .../inox-patchset/chromium-sandbox-pie.patch | 14 + .../inox-patchset/chromium-widevine.patch | 10 + .../disable-autofill-download-manager.patch | 2 +- .../disable-battery-status-service.patch | 21 + .../disable-default-extensions.patch | 70 +-- .../disable-gcm-status-check.patch | 32 + .../disable-google-ipv6-probes.patch | 17 + .../disable-google-url-tracker.patch | 2 +- .../disable-missing-key-warning.patch | 10 + .../disable-translation-lang-fetch.patch | 39 ++ .../inox-patchset/disable-update-pings.patch | 19 + .../disable-web-resource-service.patch | 0 .../inox-patchset/modify-default-prefs.patch | 144 +++++ .../inox-patchset/restore-classic-ntp.patch | 21 + ...refixes-to-possibly-evil-connections.patch | 236 ++++--- ...ll-disable-autofill-download-manager.patch | 43 -- ...ervice-disable-more-privacy-nightmar.patch | 50 -- ...sable-warning-about-missing-API-keys.patch | 25 - .../build-build-the-sandbox-with-PIE.patch | 30 - ...isable-in-prefs-and-component-loader.patch | 65 -- ...nnectivity-probes-to-RIPE-DNS-rather.patch | 33 - ...s-show-component-extensions-in-the-e.patch | 42 -- ...rf-if-metrics_reporting-is-activated.patch | 41 -- ...t_run-deactivate-autoupdate-globally.patch | 32 - ...saging-disable-experiment-status-che.patch | 46 -- .../google_now-disable-this.patch | 45 -- ...ord-disable-at-build-time-by-default.patch | 26 - ...me-and-help-identify-URLs-being-retr.patch | 40 +- ...block-third-party-cookies-by-default.patch | 28 - ...e-a-prediction-service-to-help-compl.patch | 33 - ...e-a-web-service-to-help-resolve-navi.patch | 31 - ...s-disable-background-mode-by-default.patch | 27 - .../prefs-disable-hyperlink-auditing.patch | 32 - ...prefs-disable-network-DNS-prediction.patch | 40 -- .../prefs-disable-translation-service.patch | 30 - ...fs-do-not-store-passwords-by-default.patch | 14 +- ...-do-not-tick-send-settings-by-defaul.patch | 32 - ...mo-disable-Google-promotion-fetching.patch | 24 - ..._browsing-disable-incident-reporting.patch | 10 +- ...arch-show-blank-tab-for-new-tab-page.patch | 53 -- ...g-downloading-dictionary-from-Google.patch | 25 - ...e-fetching-of-translate-languages-fr.patch | 47 -- .../updater-disable-updater-pings.patch | 67 -- .../webrtc-generate-real-ephemeral-keys.patch | 120 ---- resources/common/patches/patch_order | 43 +- 47 files changed, 1096 insertions(+), 1325 deletions(-) create mode 100644 resources/common/patches/inox-patchset/add-duckduckgo-search-engine.patch create mode 100644 resources/common/patches/inox-patchset/chromium-sandbox-pie.patch create mode 100644 resources/common/patches/inox-patchset/chromium-widevine.patch create mode 100644 resources/common/patches/inox-patchset/disable-battery-status-service.patch create mode 100644 resources/common/patches/inox-patchset/disable-gcm-status-check.patch create mode 100644 resources/common/patches/inox-patchset/disable-google-ipv6-probes.patch create mode 100644 resources/common/patches/inox-patchset/disable-missing-key-warning.patch create mode 100644 resources/common/patches/inox-patchset/disable-update-pings.patch rename resources/common/patches/{ungoogled-chromium => inox-patchset}/disable-web-resource-service.patch (100%) create mode 100644 resources/common/patches/inox-patchset/restore-classic-ntp.patch delete mode 100644 resources/common/patches/iridium-browser/autofill-disable-autofill-download-manager.patch delete mode 100644 resources/common/patches/iridium-browser/battery_status_service-disable-more-privacy-nightmar.patch delete mode 100644 resources/common/patches/iridium-browser/browser-ui-disable-warning-about-missing-API-keys.patch delete mode 100644 resources/common/patches/iridium-browser/build-build-the-sandbox-with-PIE.patch delete mode 100644 resources/common/patches/iridium-browser/cloud-print-disable-in-prefs-and-component-loader.patch delete mode 100644 resources/common/patches/iridium-browser/dns-send-IPv6-connectivity-probes-to-RIPE-DNS-rather.patch delete mode 100644 resources/common/patches/iridium-browser/extensions-always-show-component-extensions-in-the-e.patch delete mode 100644 resources/common/patches/iridium-browser/first_run-barf-if-metrics_reporting-is-activated.patch delete mode 100644 resources/common/patches/iridium-browser/first_run-deactivate-autoupdate-globally.patch delete mode 100644 resources/common/patches/iridium-browser/google-cloud-messaging-disable-experiment-status-che.patch delete mode 100644 resources/common/patches/iridium-browser/google_now-disable-this.patch delete mode 100644 resources/common/patches/iridium-browser/prefs-block-third-party-cookies-by-default.patch delete mode 100644 resources/common/patches/iridium-browser/prefs-disable-Use-a-prediction-service-to-help-compl.patch delete mode 100644 resources/common/patches/iridium-browser/prefs-disable-Use-a-web-service-to-help-resolve-navi.patch delete mode 100644 resources/common/patches/iridium-browser/prefs-disable-background-mode-by-default.patch delete mode 100644 resources/common/patches/iridium-browser/prefs-disable-hyperlink-auditing.patch delete mode 100644 resources/common/patches/iridium-browser/prefs-disable-network-DNS-prediction.patch delete mode 100644 resources/common/patches/iridium-browser/prefs-disable-translation-service.patch delete mode 100644 resources/common/patches/iridium-browser/profile-resetter-do-not-tick-send-settings-by-defaul.patch delete mode 100644 resources/common/patches/iridium-browser/search-show-blank-tab-for-new-tab-page.patch delete mode 100644 resources/common/patches/iridium-browser/spellchecker-flag-downloading-dictionary-from-Google.patch delete mode 100644 resources/common/patches/iridium-browser/translate-disable-fetching-of-translate-languages-fr.patch delete mode 100644 resources/common/patches/iridium-browser/updater-disable-updater-pings.patch delete mode 100644 resources/common/patches/iridium-browser/webrtc-generate-real-ephemeral-keys.patch diff --git a/README.md b/README.md index bef9b602..31b1f133 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,7 @@ ## Features -In addition to features provided by [Iridium Browser](//iridiumbrowser.de/) and [Inox patchset](//github.com/gcarq/inox-patchset), the following is also included: +In addition to features from [Debian](//tracker.debian.org/pkg/chromium-browser), [Inox patchset](//github.com/gcarq/inox-patchset), and [Iridium Browser](//iridiumbrowser.de/): * Replace many web domains in the source code with non-existent alternatives ending in `qjz9zk` (known as domain substitution) * Strip binaries from the source code (known as source cleaning) * This includes all pre-built executables, shared libraries, and other forms of machine code. They are substituted with system or user-provided equivalents, or built from source. @@ -80,7 +80,7 @@ There are currently two automated scripts that process the source code: * Source cleaner - Used to clean out binary files (i.e. do not seem to be human-readable text files, except a few required for building) * Domain substitution - Used to replace Google and other domains in the source code to eliminate communication not caught by the patches and build flags. -These are the general steps that ungoogled-chromium takes to build: +### General building steps 1. Get the source code archive in `.tar.xz` format via `https://commondatastorage.googleapis.com/` and extract it into `build/sandbox/` * Also download any additional non-Linux dependencies for building on non-Linux platforms, since the `.tar.xz` is generated on a Linux system @@ -94,7 +94,8 @@ These are the general steps that ungoogled-chromium takes to build: 4. Build (via 'ninja') 5. Generate binary packages and place them in `build/` -Here's a breakdown of what is in a resources directory: +### Contents of the `resources` directory + * `cleaning_list` - (Used for source cleaning) A list of files to be excluded during the extraction of the Chromium source * `domain_regex_list` - (Used for domain substitution) A list of regular expressions that define how domains will be replaced in the source code * `domain_substitution_list` - (Used for domain substitution) A list of files that are processed by `domain_regex_list` @@ -106,16 +107,21 @@ Here's a breakdown of what is in a resources directory: All of these files are human-readable, but they are usually processed by the Python building system. See the Building section below for more information. -Here's a breakdown of the `common/patches` directory: -* `ungoogled-chromium/` - Contains new patches for ungoogled-chromium. They implement the features described above. -* `iridium-browser` - Contains a subset of patches from Iridium Browser. +### Contents of the `resources/common/patches` directory + +* `debian/` - Contains patches from Debian's Chromium. * Patches are not touched unless they do not apply cleanly onto the version of Chromium being built - * Patches are from the `patchview` branch of Iridium's Git repository. [Git webview of the patchview branch](//git.iridiumbrowser.de/cgit.cgi/iridium-browser/?h=patchview) + * These patches are not Debian-specific. For those, see the `resources/debian/patches` directory * `inox-patchset/` - Contains a modified subset of patches from Inox patchset. + * Some patches such as those that change branding are omitted + * Patches are not touched unless they conflict with Debian's patches * Patches are from [inox-patchset's GitHub](//github.com/gcarq/inox-patchset) * [Inox patchset's license](//github.com/gcarq/inox-patchset/blob/master/LICENSE) -* `debian/` - Contains patches from Debian's Chromium. - * These patches are not Debian-specific. For those, see the `resources/debian/patches` directory +* `iridium-browser` - Contains a modified subset of patches from Iridium Browser. + * Some patches such as those that change branding or URLs to point to Iridium's own servers are omitted + * Patches are not touched unless they conflict with Debian's or Inox's patches + * Patches are from the `patchview` branch of Iridium's Git repository. [Git webview of the patchview branch](//git.iridiumbrowser.de/cgit.cgi/iridium-browser/?h=patchview) +* `ungoogled-chromium/` - Contains new patches for ungoogled-chromium. They implement the features described above. ## Building @@ -140,7 +146,7 @@ Pull requests are also welcome. Here are some guidelines: [Inox patchset](//github.com/gcarq/inox-patchset) -[Debian for build scripts](//tracker.debian.org/pkg/chromium-browser) +[Debian](//tracker.debian.org/pkg/chromium-browser) [The Chromium Project](//www.chromium.org/) diff --git a/resources/common/patches/inox-patchset/add-duckduckgo-search-engine.patch b/resources/common/patches/inox-patchset/add-duckduckgo-search-engine.patch new file mode 100644 index 00000000..5c5afe2a --- /dev/null +++ b/resources/common/patches/inox-patchset/add-duckduckgo-search-engine.patch @@ -0,0 +1,584 @@ +--- ./components/search_engines/prepopulated_engines.json ++++ ./components/search_engines/prepopulated_engines.json.new +@@ -36,6 +36,17 @@ + // The following engines are included in country lists and are added to the + // list of search engines on the first run depending on user's country. + "elements": { ++ "duckduckgo": { ++ "name": "DuckDuckGo", ++ "keyword": "duckduckgo.com", ++ "favicon_url": "https://duckduckgo.com/favicon.ico", ++ "search_url": "https://duckduckgo.com/?q={searchTerms}", ++ "suggest_url": "https://duckduckgo.com/?q={searchTerms}&language={language}&kac=1", ++ "new_tab_url": "about:blank", ++ "type": "SEARCH_ENGINE_DUCKDUCKGO", ++ "id": 11 ++ }, ++ + "aol": { + "name": "AOL", + "keyword": "aol.com", +--- ./components/search_engines/search_engine_type.h ++++ ./components/search_engines/search_engine_type.h.new +@@ -58,6 +58,7 @@ enum SearchEngineType { + SEARCH_ENGINE_YAHOO, + SEARCH_ENGINE_YANDEX, + SEARCH_ENGINE_ZOZNAM, ++ SEARCH_ENGINE_DUCKDUCKGO, + SEARCH_ENGINE_MAX // Bounding value needed for UMA histogram macro. + }; + + +--- ./components/search_engines/template_url_prepopulate_data.cc ++++ ./components/search_engines/template_url_prepopulate_data.cc.new +@@ -48,441 +48,441 @@ + + // Default (for countries with no better engine set) + const PrepopulatedEngine* engines_default[] = +- { &google, &bing, &yahoo, }; ++ { &duckduckgo, &google, &bing, &yahoo, }; + + // United Arab Emirates + const PrepopulatedEngine* engines_AE[] = +- { &google, &yahoo_maktoob, &bing, }; ++ { &duckduckgo, &google, &yahoo_maktoob, &bing, }; + + // Albania + const PrepopulatedEngine* engines_AL[] = +- { &google, &yahoo, &bing, }; ++ { &duckduckgo, &google, &yahoo, &bing, }; + + // Argentina + const PrepopulatedEngine* engines_AR[] = +- { &google, &bing, &yahoo_ar, }; ++ { &duckduckgo, &google, &bing, &yahoo_ar, }; + + // Austria + const PrepopulatedEngine* engines_AT[] = +- { &google, &bing, &yahoo_at, }; ++ { &duckduckgo, &google, &bing, &yahoo_at, }; + + // Australia + const PrepopulatedEngine* engines_AU[] = +- { &google, &bing, &yahoo_au, }; ++ { &duckduckgo, &google, &bing, &yahoo_au, }; + + // Bosnia and Herzegovina + const PrepopulatedEngine* engines_BA[] = +- { &google, &yahoo, &bing, }; ++ { &duckduckgo, &google, &yahoo, &bing, }; + + // Belgium + const PrepopulatedEngine* engines_BE[] = +- { &google, &bing, &yahoo, &yahoo_fr, }; ++ { &duckduckgo, &google, &bing, &yahoo, &yahoo_fr, }; + + // Bulgaria + const PrepopulatedEngine* engines_BG[] = +- { &google, &bing, &ask, }; ++ { &duckduckgo, &google, &bing, &ask, }; + + // Bahrain + const PrepopulatedEngine* engines_BH[] = +- { &google, &yahoo_maktoob, &bing, }; ++ { &duckduckgo, &google, &yahoo_maktoob, &bing, }; + + // Burundi + const PrepopulatedEngine* engines_BI[] = +- { &google, &yahoo, &bing, }; ++ { &duckduckgo, &google, &yahoo, &bing, }; + + // Brunei + const PrepopulatedEngine* engines_BN[] = +- { &google, &yahoo_my, &bing, }; ++ { &duckduckgo, &google, &yahoo_my, &bing, }; + + // Bolivia + const PrepopulatedEngine* engines_BO[] = +- { &google, &bing, &yahoo, }; ++ { &duckduckgo, &google, &bing, &yahoo, }; + + // Brazil + const PrepopulatedEngine* engines_BR[] = +- { &google, &ask_br, &bing, &yahoo_br, }; ++ { &duckduckgo, &google, &ask_br, &bing, &yahoo_br, }; + + // Belarus + const PrepopulatedEngine* engines_BY[] = +- { &google, &yandex_by, &mail_ru, }; ++ { &duckduckgo, &google, &yandex_by, &mail_ru, }; + + // Belize + const PrepopulatedEngine* engines_BZ[] = +- { &google, &yahoo, &bing, }; ++ { &duckduckgo, &google, &yahoo, &bing, }; + + // Canada + const PrepopulatedEngine* engines_CA[] = +- { &google, &bing, &ask, &yahoo_ca, &yahoo_qc, }; ++ { &duckduckgo, &google, &bing, &ask, &yahoo_ca, &yahoo_qc, }; + + // Switzerland + const PrepopulatedEngine* engines_CH[] = +- { &google, &bing, &yahoo_ch, }; ++ { &duckduckgo, &google, &bing, &yahoo_ch, }; + + // Chile + const PrepopulatedEngine* engines_CL[] = +- { &google, &bing, &yahoo_cl, }; ++ { &duckduckgo, &google, &bing, &yahoo_cl, }; + + // China + const PrepopulatedEngine* engines_CN[] = +- { &google, &baidu, &sogou, }; ++ { &duckduckgo, &google, &baidu, &sogou, }; + + // Colombia + const PrepopulatedEngine* engines_CO[] = +- { &google, &bing, &yahoo_co, }; ++ { &duckduckgo, &google, &bing, &yahoo_co, }; + + // Costa Rica + const PrepopulatedEngine* engines_CR[] = +- { &google, &yahoo, &bing, }; ++ { &duckduckgo, &google, &yahoo, &bing, }; + + // Czech Republic + const PrepopulatedEngine* engines_CZ[] = +- { &google, &seznam, &bing, }; ++ { &duckduckgo, &google, &seznam, &bing, }; + + // Germany + const PrepopulatedEngine* engines_DE[] = +- { &google, &bing, &yahoo_de }; ++ { &duckduckgo, &google, &bing, &yahoo_de }; + + // Denmark + const PrepopulatedEngine* engines_DK[] = +- { &google, &bing, &yahoo_dk, }; ++ { &duckduckgo, &google, &bing, &yahoo_dk, }; + + // Dominican Republic + const PrepopulatedEngine* engines_DO[] = +- { &google, &yahoo, &bing, }; ++ { &duckduckgo, &google, &yahoo, &bing, }; + + // Algeria + const PrepopulatedEngine* engines_DZ[] = +- { &google, &bing, &yahoo_maktoob, }; ++ { &duckduckgo, &google, &bing, &yahoo_maktoob, }; + + // Ecuador + const PrepopulatedEngine* engines_EC[] = +- { &google, &bing, &yahoo, }; ++ { &duckduckgo, &google, &bing, &yahoo, }; + + // Estonia + const PrepopulatedEngine* engines_EE[] = +- { &google, &bing, &yahoo, }; ++ { &duckduckgo, &google, &bing, &yahoo, }; + + // Egypt + const PrepopulatedEngine* engines_EG[] = +- { &google, &yahoo_maktoob, &bing, }; ++ { &duckduckgo, &google, &yahoo_maktoob, &bing, }; + + // Spain + const PrepopulatedEngine* engines_ES[] = +- { &google, &bing, &yahoo_es, }; ++ { &duckduckgo, &google, &bing, &yahoo_es, }; + + // Faroe Islands + const PrepopulatedEngine* engines_FO[] = +- { &google, &bing, &ask, }; ++ { &duckduckgo, &google, &bing, &ask, }; + + // Finland + const PrepopulatedEngine* engines_FI[] = +- { &google, &bing, &yahoo_fi, }; ++ { &duckduckgo, &google, &bing, &yahoo_fi, }; + + // France + const PrepopulatedEngine* engines_FR[] = +- { &google, &bing, &yahoo_fr, }; ++ { &duckduckgo, &google, &bing, &yahoo_fr, }; + + // United Kingdom + const PrepopulatedEngine* engines_GB[] = +- { &google, &bing, &yahoo_uk, &ask_uk, }; ++ { &duckduckgo, &google, &bing, &yahoo_uk, &ask_uk, }; + + // Greece + const PrepopulatedEngine* engines_GR[] = +- { &google, &bing, &yahoo_gr, }; ++ { &duckduckgo, &google, &bing, &yahoo_gr, }; + + // Guatemala + const PrepopulatedEngine* engines_GT[] = +- { &google, &yahoo, &bing, }; ++ { &duckduckgo, &google, &yahoo, &bing, }; + + // Hong Kong + const PrepopulatedEngine* engines_HK[] = +- { &google, &yahoo_hk, &baidu, &bing, }; ++ { &duckduckgo, &google, &yahoo_hk, &baidu, &bing, }; + + // Honduras + const PrepopulatedEngine* engines_HN[] = +- { &google, &yahoo, &bing, }; ++ { &duckduckgo, &google, &yahoo, &bing, }; + + // Croatia + const PrepopulatedEngine* engines_HR[] = +- { &google, &bing, &yahoo, }; ++ { &duckduckgo, &google, &bing, &yahoo, }; + + // Hungary + const PrepopulatedEngine* engines_HU[] = +- { &google, &bing, &yahoo, }; ++ { &duckduckgo, &google, &bing, &yahoo, }; + + // Indonesia + const PrepopulatedEngine* engines_ID[] = +- { &google, &yahoo_id, &bing, }; ++ { &duckduckgo, &google, &yahoo_id, &bing, }; + + // Ireland + const PrepopulatedEngine* engines_IE[] = +- { &google, &bing, &yahoo_uk, }; ++ { &duckduckgo, &google, &bing, &yahoo_uk, }; + + // Israel + const PrepopulatedEngine* engines_IL[] = +- { &google, &yahoo, &bing, }; ++ { &duckduckgo, &google, &yahoo, &bing, }; + + // India + const PrepopulatedEngine* engines_IN[] = +- { &google, &bing, &yahoo_in, }; ++ { &duckduckgo, &google, &bing, &yahoo_in, }; + + // Iraq + const PrepopulatedEngine* engines_IQ[] = +- { &google, &yahoo_maktoob, &bing, }; ++ { &duckduckgo, &google, &yahoo_maktoob, &bing, }; + + // Iran + const PrepopulatedEngine* engines_IR[] = +- { &google, &yahoo, &bing, }; ++ { &duckduckgo, &google, &yahoo, &bing, }; + + // Iceland + const PrepopulatedEngine* engines_IS[] = +- { &google, &bing, &yahoo, }; ++ { &duckduckgo, &google, &bing, &yahoo, }; + + // Italy + const PrepopulatedEngine* engines_IT[] = +- { &google, &virgilio, &bing, }; ++ { &duckduckgo, &google, &virgilio, &bing, }; + + // Jamaica + const PrepopulatedEngine* engines_JM[] = +- { &google, &yahoo, &bing, }; ++ { &duckduckgo, &google, &yahoo, &bing, }; + + // Jordan + const PrepopulatedEngine* engines_JO[] = +- { &google, &yahoo_maktoob, &bing, }; ++ { &duckduckgo, &google, &yahoo_maktoob, &bing, }; + + // Japan + const PrepopulatedEngine* engines_JP[] = +- { &google, &yahoo_jp, &bing, }; ++ { &duckduckgo, &google, &yahoo_jp, &bing, }; + + // Kenya + const PrepopulatedEngine* engines_KE[] = +- { &google, &yahoo, &bing, }; ++ { &duckduckgo, &google, &yahoo, &bing, }; + + // Kuwait + const PrepopulatedEngine* engines_KW[] = +- { &google, &yahoo_maktoob, &bing, }; ++ { &duckduckgo, &google, &yahoo_maktoob, &bing, }; + + // South Korea + const PrepopulatedEngine* engines_KR[] = +- { &google, &naver, &daum, }; ++ { &duckduckgo, &google, &naver, &daum, }; + + // Kazakhstan + const PrepopulatedEngine* engines_KZ[] = +- { &google, &mail_ru, &yandex_kz, }; ++ { &duckduckgo, &google, &mail_ru, &yandex_kz, }; + + // Lebanon + const PrepopulatedEngine* engines_LB[] = +- { &google, &yahoo_maktoob, &bing, }; ++ { &duckduckgo, &google, &yahoo_maktoob, &bing, }; + + // Liechtenstein + const PrepopulatedEngine* engines_LI[] = +- { &google, &bing, &yahoo_de, }; ++ { &duckduckgo, &google, &bing, &yahoo_de, }; + + // Lithuania + const PrepopulatedEngine* engines_LT[] = +- { &google, &bing, &yandex_ru, }; ++ { &duckduckgo, &google, &bing, &yandex_ru, }; + + // Luxembourg + const PrepopulatedEngine* engines_LU[] = +- { &google, &bing, &yahoo_fr, }; ++ { &duckduckgo, &google, &bing, &yahoo_fr, }; + + // Latvia + const PrepopulatedEngine* engines_LV[] = +- { &google, &yandex_ru, &bing, }; ++ { &duckduckgo, &google, &yandex_ru, &bing, }; + + // Libya + const PrepopulatedEngine* engines_LY[] = +- { &google, &yahoo_maktoob, &bing, }; ++ { &duckduckgo, &google, &yahoo_maktoob, &bing, }; + + // Morocco + const PrepopulatedEngine* engines_MA[] = +- { &google, &bing, &yahoo_maktoob, }; ++ { &duckduckgo, &google, &bing, &yahoo_maktoob, }; + + // Monaco + const PrepopulatedEngine* engines_MC[] = +- { &google, &yahoo_fr, &bing, }; ++ { &duckduckgo, &google, &yahoo_fr, &bing, }; + + // Moldova + const PrepopulatedEngine* engines_MD[] = +- { &google, &bing, &yahoo, }; ++ { &duckduckgo, &google, &bing, &yahoo, }; + + // Montenegro + const PrepopulatedEngine* engines_ME[] = +- { &google, &bing, &yahoo, }; ++ { &duckduckgo, &google, &bing, &yahoo, }; + + // Macedonia + const PrepopulatedEngine* engines_MK[] = +- { &google, &yahoo, &bing, }; ++ { &duckduckgo, &google, &yahoo, &bing, }; + + // Mexico + const PrepopulatedEngine* engines_MX[] = +- { &google, &bing, &yahoo_mx, }; ++ { &duckduckgo, &google, &bing, &yahoo_mx, }; + + // Malaysia + const PrepopulatedEngine* engines_MY[] = +- { &google, &yahoo_my, &bing, }; ++ { &duckduckgo, &google, &yahoo_my, &bing, }; + + // Nicaragua + const PrepopulatedEngine* engines_NI[] = +- { &google, &yahoo, &bing, }; ++ { &duckduckgo, &google, &yahoo, &bing, }; + + // Netherlands + const PrepopulatedEngine* engines_NL[] = +- { &google, &yahoo_nl, &vinden, }; ++ { &duckduckgo, &google, &yahoo_nl, &vinden, }; + + // Norway + const PrepopulatedEngine* engines_NO[] = +- { &google, &bing, &kvasir, }; ++ { &duckduckgo, &google, &bing, &kvasir, }; + + // New Zealand + const PrepopulatedEngine* engines_NZ[] = +- { &google, &bing, &yahoo_nz, }; ++ { &duckduckgo, &google, &bing, &yahoo_nz, }; + + // Oman + const PrepopulatedEngine* engines_OM[] = +- { &google, &bing, &yahoo_maktoob, }; ++ { &duckduckgo, &google, &bing, &yahoo_maktoob, }; + + // Panama + const PrepopulatedEngine* engines_PA[] = +- { &google, &yahoo, &bing, }; ++ { &duckduckgo, &google, &yahoo, &bing, }; + + // Peru + const PrepopulatedEngine* engines_PE[] = +- { &google, &bing, &yahoo_pe, }; ++ { &duckduckgo, &google, &bing, &yahoo_pe, }; + + // Philippines + const PrepopulatedEngine* engines_PH[] = +- { &google, &yahoo_ph, &bing, }; ++ { &duckduckgo, &google, &yahoo_ph, &bing, }; + + // Pakistan + const PrepopulatedEngine* engines_PK[] = +- { &google, &yahoo, &bing, }; ++ { &duckduckgo, &google, &yahoo, &bing, }; + + // Puerto Rico + const PrepopulatedEngine* engines_PR[] = +- { &google, &yahoo, &bing, }; ++ { &duckduckgo, &google, &yahoo, &bing, }; + + // Poland + const PrepopulatedEngine* engines_PL[] = +- { &google, &onet, &bing, }; ++ { &duckduckgo, &google, &onet, &bing, }; + + // Portugal + const PrepopulatedEngine* engines_PT[] = +- { &google, &bing, &yahoo, }; ++ { &duckduckgo, &google, &bing, &yahoo, }; + + // Paraguay + const PrepopulatedEngine* engines_PY[] = +- { &google, &bing, &yahoo, }; ++ { &duckduckgo, &google, &bing, &yahoo, }; + + // Qatar + const PrepopulatedEngine* engines_QA[] = +- { &google, &yahoo_maktoob, &bing, }; ++ { &duckduckgo, &google, &yahoo_maktoob, &bing, }; + + // Romania + const PrepopulatedEngine* engines_RO[] = +- { &google, &yahoo_ro, &bing, }; ++ { &duckduckgo, &google, &yahoo_ro, &bing, }; + + // Serbia + const PrepopulatedEngine* engines_RS[] = +- { &google, &bing, &yahoo, }; ++ { &duckduckgo, &google, &bing, &yahoo, }; + + // Russia + const PrepopulatedEngine* engines_RU[] = +- { &google, &yandex_ru, &mail_ru, }; ++ { &duckduckgo, &google, &yandex_ru, &mail_ru, }; + + // Rwanda + const PrepopulatedEngine* engines_RW[] = +- { &google, &bing, &yahoo, }; ++ { &duckduckgo, &google, &bing, &yahoo, }; + + // Saudi Arabia + const PrepopulatedEngine* engines_SA[] = +- { &google, &yahoo_maktoob, &bing, }; ++ { &duckduckgo, &google, &yahoo_maktoob, &bing, }; + + // Sweden + const PrepopulatedEngine* engines_SE[] = +- { &google, &bing, &yahoo_se, }; ++ { &duckduckgo, &google, &bing, &yahoo_se, }; + + // Singapore + const PrepopulatedEngine* engines_SG[] = +- { &google, &yahoo_sg, &bing, }; ++ { &duckduckgo, &google, &yahoo_sg, &bing, }; + + // Slovenia + const PrepopulatedEngine* engines_SI[] = +- { &google, &najdi, &ask, }; ++ { &duckduckgo, &google, &najdi, &ask, }; + + // Slovakia + const PrepopulatedEngine* engines_SK[] = +- { &google, &bing, &yahoo, }; ++ { &duckduckgo, &google, &bing, &yahoo, }; + + // El Salvador + const PrepopulatedEngine* engines_SV[] = +- { &google, &yahoo, &bing, }; ++ { &duckduckgo, &google, &yahoo, &bing, }; + + // Syria + const PrepopulatedEngine* engines_SY[] = +- { &google, &bing, &yahoo_maktoob, }; ++ { &duckduckgo, &google, &bing, &yahoo_maktoob, }; + + // Thailand + const PrepopulatedEngine* engines_TH[] = +- { &google, &yahoo_th, &bing, }; ++ { &duckduckgo, &google, &yahoo_th, &bing, }; + + // Tunisia + const PrepopulatedEngine* engines_TN[] = +- { &google, &bing, &yahoo_maktoob, }; ++ { &duckduckgo, &google, &bing, &yahoo_maktoob, }; + + // Turkey + const PrepopulatedEngine* engines_TR[] = +- { &google, &bing, &yahoo_tr, &yandex_tr, }; ++ { &duckduckgo, &google, &bing, &yahoo_tr, &yandex_tr, }; + + // Trinidad and Tobago + const PrepopulatedEngine* engines_TT[] = +- { &google, &bing, &yahoo, }; ++ { &duckduckgo, &google, &bing, &yahoo, }; + + // Taiwan + const PrepopulatedEngine* engines_TW[] = +- { &google, &yahoo_tw, &bing, }; ++ { &duckduckgo, &google, &yahoo_tw, &bing, }; + + // Tanzania + const PrepopulatedEngine* engines_TZ[] = +- { &google, &yahoo, &bing, }; ++ { &duckduckgo, &google, &yahoo, &bing, }; + + // Ukraine + const PrepopulatedEngine* engines_UA[] = +- { &google, &yandex_ua, &bing, }; ++ { &duckduckgo, &google, &yandex_ua, &bing, }; + + // United States + const PrepopulatedEngine* engines_US[] = +- { &google, &bing, &yahoo, &aol, &ask, }; ++ { &duckduckgo, &google, &bing, &yahoo, &aol, &ask, }; + + // Uruguay + const PrepopulatedEngine* engines_UY[] = +- { &google, &bing, &yahoo, }; ++ { &duckduckgo, &google, &bing, &yahoo, }; + + // Venezuela + const PrepopulatedEngine* engines_VE[] = +- { &google, &bing, &yahoo_ve, }; ++ { &duckduckgo, &google, &bing, &yahoo_ve, }; + + // Vietnam + const PrepopulatedEngine* engines_VN[] = +- { &google, &yahoo_vn, &bing, }; ++ { &duckduckgo, &google, &yahoo_vn, &bing, }; + + // Yemen + const PrepopulatedEngine* engines_YE[] = +- { &google, &bing, &yahoo_maktoob, }; ++ { &duckduckgo, &google, &bing, &yahoo_maktoob, }; + + // South Africa + const PrepopulatedEngine* engines_ZA[] = +- { &google, &bing, &yahoo, }; ++ { &duckduckgo, &google, &bing, &yahoo, }; + + // Zimbabwe + const PrepopulatedEngine* engines_ZW[] = +- { &google, &bing, &yahoo, &ask, }; ++ { &duckduckgo, &google, &bing, &yahoo, &ask, }; + + // A list of all the engines that we know about. + const PrepopulatedEngine* kAllEngines[] = { + // Prepopulated engines: + &aol, &ask, &ask_br, &ask_uk, &baidu, +- &bing, &daum, &google, &kvasir, &mail_ru, ++ &bing, &daum,&duckduckgo,&google, &kvasir, &mail_ru, + &najdi, &naver, &onet, &seznam, &sogou, + &vinden, &virgilio, &yahoo, &yahoo_ar, &yahoo_at, + &yahoo_au, &yahoo_br, &yahoo_ca, &yahoo_ch, &yahoo_cl, diff --git a/resources/common/patches/inox-patchset/chromium-sandbox-pie.patch b/resources/common/patches/inox-patchset/chromium-sandbox-pie.patch new file mode 100644 index 00000000..fc187500 --- /dev/null +++ b/resources/common/patches/inox-patchset/chromium-sandbox-pie.patch @@ -0,0 +1,14 @@ +--- a/sandbox/linux/sandbox_linux.gypi ++++ b/sandbox/linux/sandbox_linux.gypi +@@ -221,7 +221,10 @@ + ], + 'cflags': [ + # For ULLONG_MAX +- '-std=gnu99', ++ '-std=gnu99 -fPIE', ++ ], ++ 'ldflags': [ ++ '-pie', + ], + 'include_dirs': [ + '../..', diff --git a/resources/common/patches/inox-patchset/chromium-widevine.patch b/resources/common/patches/inox-patchset/chromium-widevine.patch new file mode 100644 index 00000000..1684009f --- /dev/null +++ b/resources/common/patches/inox-patchset/chromium-widevine.patch @@ -0,0 +1,10 @@ +diff -upr chromium-48.0.2564.82.orig/third_party/widevine/cdm/stub/widevine_cdm_version.h chromium-48.0.2564.82/third_party/widevine/cdm/stub/widevine_cdm_version.h +--- chromium-48.0.2564.82.orig/third_party/widevine/cdm/stub/widevine_cdm_version.h 2016-01-14 01:05:17.000000000 +0200 ++++ chromium-48.0.2564.82/third_party/widevine/cdm/stub/widevine_cdm_version.h 2016-01-21 19:18:51.287978456 +0200 +@@ -12,4 +12,6 @@ + + #define WIDEVINE_CDM_AVAILABLE + ++#define WIDEVINE_CDM_VERSION_STRING "ungoogled-chromium" ++ + #endif // WIDEVINE_CDM_VERSION_H_ diff --git a/resources/common/patches/inox-patchset/disable-autofill-download-manager.patch b/resources/common/patches/inox-patchset/disable-autofill-download-manager.patch index efdfd264..082eb8a8 100644 --- a/resources/common/patches/inox-patchset/disable-autofill-download-manager.patch +++ b/resources/common/patches/inox-patchset/disable-autofill-download-manager.patch @@ -4,7 +4,7 @@ } GURL GetRequestUrl(AutofillDownloadManager::RequestType request_type) { -- return GURL("trk:158:https://clients1.google.com/tbproxy/af/" + +- return GURL("https://clients1.google.com/tbproxy/af/" + - RequestTypeToString(request_type) + "?client=" + kClientName); + return GURL("about:blank"); } diff --git a/resources/common/patches/inox-patchset/disable-battery-status-service.patch b/resources/common/patches/inox-patchset/disable-battery-status-service.patch new file mode 100644 index 00000000..991b6a63 --- /dev/null +++ b/resources/common/patches/inox-patchset/disable-battery-status-service.patch @@ -0,0 +1,21 @@ +--- a/device/battery/battery_status_service.cc ++++ b/device/battery/battery_status_service.cc +@@ -42,6 +42,7 @@ BatteryStatusService::AddCallback(const BatteryUpdateCallback& callback) { + if (!battery_fetcher_) + battery_fetcher_ = BatteryStatusManager::Create(update_callback_); + ++#if 0 + if (callback_list_.empty()) { + bool success = battery_fetcher_->StartListeningBatteryChange(); + // On failure pass the default values back. +@@ -53,6 +54,10 @@ BatteryStatusService::AddCallback(const BatteryUpdateCallback& callback) { + // Send recent status to the new callback if already available. + callback.Run(status_); + } ++#else ++ // Always pass the default values. ++ callback.Run(BatteryStatus()); ++#endif + + return callback_list_.Add(callback); + } diff --git a/resources/common/patches/inox-patchset/disable-default-extensions.patch b/resources/common/patches/inox-patchset/disable-default-extensions.patch index fdd2e2c6..b820f270 100644 --- a/resources/common/patches/inox-patchset/disable-default-extensions.patch +++ b/resources/common/patches/inox-patchset/disable-default-extensions.patch @@ -1,6 +1,6 @@ ---- a/chrome/browser/extensions/component_loader.cc -+++ b/chrome/browser/extensions/component_loader.cc -@@ -350,10 +350,6 @@ void ComponentLoader::AddWebstoreWidgetExtension() { +--- ./chrome/browser/extensions/component_loader.cc ++++ ./chrome/browser/extensions/component_loader.cc.new +@@ -340,24 +340,12 @@ } void ComponentLoader::AddHangoutServicesExtension() { @@ -11,51 +11,21 @@ } void ComponentLoader::AddHotwordAudioVerificationApp() { -@@ -387,43 +383,6 @@ void ComponentLoader::AddNetworkSpeechSynthesisExtension() { +- if (HotwordServiceFactory::IsAlwaysOnAvailable()) { +- Add(IDR_HOTWORD_AUDIO_VERIFICATION_MANIFEST, +- base::FilePath(FILE_PATH_LITERAL("hotword_audio_verification"))); +- } } - void ComponentLoader::AddGoogleNowExtension() { --#if BUILDFLAG(ENABLE_GOOGLE_NOW) -- const char kEnablePrefix[] = "Enable"; -- const char kFieldTrialName[] = "GoogleNow"; -- std::string enable_prefix(kEnablePrefix); -- std::string field_trial_result = -- base::FieldTrialList::FindFullName(kFieldTrialName); -- -- bool enabled_via_field_trial = -- field_trial_result.compare(0, enable_prefix.length(), enable_prefix) == 0; -- -- // Enable the feature on trybots and trunk builds. -- bool enabled_via_trunk_build = -- chrome::GetChannel() == version_info::Channel::UNKNOWN; -- -- bool is_authenticated = -- SigninManagerFactory::GetForProfile(profile_)->IsAuthenticated(); -- -- bool enabled = -- (enabled_via_field_trial && is_authenticated) || enabled_via_trunk_build; -- --#if defined(ENABLE_APP_LIST) && defined(OS_CHROMEOS) -- // Don't load if newer trial is running (== new extension id is available). -- std::string ignored_extension_id; -- if (GetGoogleNowExtensionId(&ignored_extension_id)) { -- enabled = false; + void ComponentLoader::AddHotwordHelperExtension() { +- if (HotwordServiceFactory::IsHotwordAllowed(profile_)) { +- Add(IDR_HOTWORD_MANIFEST, +- base::FilePath(FILE_PATH_LITERAL("hotword"))); - } --#endif // defined(ENABLE_APP_LIST) && defined(OS_CHROMEOS) -- -- const int google_now_manifest_id = IDR_GOOGLE_NOW_MANIFEST; -- const base::FilePath root_directory = -- base::FilePath(FILE_PATH_LITERAL("google_now")); -- if (enabled) { -- Add(google_now_manifest_id, root_directory); -- } else { -- DeleteData(google_now_manifest_id, root_directory); -- } --#endif // BUILDFLAG(ENABLE_GOOGLE_NOW) } - #if defined(OS_CHROMEOS) -@@ -499,15 +458,6 @@ void ComponentLoader::AddKeyboardApp() { + void ComponentLoader::AddImageLoaderExtension() { +@@ -445,15 +433,6 @@ } void ComponentLoader::AddWebStoreApp() { @@ -71,9 +41,19 @@ } scoped_refptr ComponentLoader::CreateExtension( -@@ -640,13 +590,6 @@ void ComponentLoader::AddDefaultComponentExtensionsWithBackgroundPages( +@@ -504,9 +483,6 @@ + DCHECK(!skip_session_components); + Add(IDR_BOOKMARKS_MANIFEST, + base::FilePath(FILE_PATH_LITERAL("bookmark_manager"))); +- // Cloud Print component app. Not required on Chrome OS. +- Add(IDR_CLOUDPRINT_MANIFEST, +- base::FilePath(FILE_PATH_LITERAL("cloud_print"))); + #endif + + if (!skip_session_components) { +@@ -583,13 +559,6 @@ + AddHotwordHelperExtension(); AddImageLoaderExtension(); - AddGoogleNowExtension(); - bool install_feedback = enable_background_extensions_during_testing; -#if defined(GOOGLE_CHROME_BUILD) diff --git a/resources/common/patches/inox-patchset/disable-gcm-status-check.patch b/resources/common/patches/inox-patchset/disable-gcm-status-check.patch new file mode 100644 index 00000000..2ae17d0b --- /dev/null +++ b/resources/common/patches/inox-patchset/disable-gcm-status-check.patch @@ -0,0 +1,32 @@ +--- ./components/gcm_driver/gcm_channel_status_request.cc ++++ ./components/gcm_driver/gcm_channel_status_request.cc.new +@@ -19,8 +19,10 @@ namespace gcm { + + namespace { + ++#if 0 + const char kRequestContentType[] = "application/octet-stream"; + const char kGCMChannelTag[] = "gcm_channel"; ++#endif + const int kDefaultPollIntervalSeconds = 60 * 60; // 60 minutes. + const int kMinPollIntervalSeconds = 30 * 60; // 30 minutes. + +@@ -53,6 +55,7 @@ int GCMChannelStatusRequest::min_poll_interval_seconds() { + } + + void GCMChannelStatusRequest::Start() { ++#if 0 + DCHECK(!url_fetcher_.get()); + + GURL request_url(channel_status_request_url_); +@@ -72,6 +75,9 @@ void GCMChannelStatusRequest::Start() { + url_fetcher_->SetLoadFlags(net::LOAD_DO_NOT_SEND_COOKIES | + net::LOAD_DO_NOT_SAVE_COOKIES); + url_fetcher_->Start(); ++#endif ++ // Simulate an empty response and disable GCM. ++ callback_.Run(false, false, 0); + } + + void GCMChannelStatusRequest::OnURLFetchComplete( + diff --git a/resources/common/patches/inox-patchset/disable-google-ipv6-probes.patch b/resources/common/patches/inox-patchset/disable-google-ipv6-probes.patch new file mode 100644 index 00000000..a9b3518f --- /dev/null +++ b/resources/common/patches/inox-patchset/disable-google-ipv6-probes.patch @@ -0,0 +1,17 @@ +--- ./net/dns/host_resolver_impl.cc ++++ ./net/dns/host_resolver_impl.cc.new +@@ -78,10 +78,10 @@ const char kLocalhost[] = "localhost."; + // cached. + const int kIPv6ProbePeriodMs = 1000; + +-// Google DNS address used for IPv6 probes. ++/* RIPE NCC k.root-servers.net. 2001:7fd::1 (anycasted) */ + const uint8_t kIPv6ProbeAddress[] = +- { 0x20, 0x01, 0x48, 0x60, 0x48, 0x60, 0x00, 0x00, +- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x88, 0x88 }; ++ { 0x20, 0x01, 0x07, 0xfd, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01 }; + + // We use a separate histogram name for each platform to facilitate the + // display of error codes by their symbolic name (since each platform has + diff --git a/resources/common/patches/inox-patchset/disable-google-url-tracker.patch b/resources/common/patches/inox-patchset/disable-google-url-tracker.patch index ef289de7..302b0971 100644 --- a/resources/common/patches/inox-patchset/disable-google-url-tracker.patch +++ b/resources/common/patches/inox-patchset/disable-google-url-tracker.patch @@ -4,7 +4,7 @@ const char GoogleURLTracker::kDefaultGoogleHomepage[] = -- "trk:192:https://www.google.com/"; +- "https://www.google.com/"; + ""; const char GoogleURLTracker::kSearchDomainCheckURL[] = - "https://www.google.com/searchdomaincheck?format=domain&type=chrome"; diff --git a/resources/common/patches/inox-patchset/disable-missing-key-warning.patch b/resources/common/patches/inox-patchset/disable-missing-key-warning.patch new file mode 100644 index 00000000..aaa1a75e --- /dev/null +++ b/resources/common/patches/inox-patchset/disable-missing-key-warning.patch @@ -0,0 +1,10 @@ +--- ./chrome/browser/ui/startup/google_api_keys_infobar_delegate.cc ++++ ./chrome/browser/ui/startup/google_api_keys_infobar_delegate.cc.new +@@ -15,6 +15,7 @@ + + // static + void GoogleApiKeysInfoBarDelegate::Create(InfoBarService* infobar_service) { ++ return; + if (google_apis::HasKeysConfigured()) + return; + diff --git a/resources/common/patches/inox-patchset/disable-translation-lang-fetch.patch b/resources/common/patches/inox-patchset/disable-translation-lang-fetch.patch index 46380115..ebccaad5 100644 --- a/resources/common/patches/inox-patchset/disable-translation-lang-fetch.patch +++ b/resources/common/patches/inox-patchset/disable-translation-lang-fetch.patch @@ -1,3 +1,42 @@ +--- ./components/translate/core/browser/translate_language_list.cc ++++ ./components/translate/core/browser/translate_language_list.cc.new +@@ -200,35 +200,6 @@ + } + + void TranslateLanguageList::RequestLanguageList() { +- // If resource requests are not allowed, we'll get a callback when they are. +- if (!resource_requests_allowed_) { +- request_pending_ = true; +- return; +- } +- +- request_pending_ = false; +- +- if (language_list_fetcher_.get() && +- (language_list_fetcher_->state() == TranslateURLFetcher::IDLE || +- language_list_fetcher_->state() == TranslateURLFetcher::FAILED)) { +- GURL url = TranslateLanguageUrl(); +- url = AddHostLocaleToUrl(url); +- url = AddApiKeyToUrl(url); +- url = net::AppendQueryParameter( +- url, kAlphaLanguageQueryName, kAlphaLanguageQueryValue); +- +- std::string message = base::StringPrintf( +- "Language list including alpha languages fetch starts (URL: %s)", +- url.spec().c_str()); +- NotifyEvent(__LINE__, message); +- +- bool result = language_list_fetcher_->Request( +- url, +- base::Bind(&TranslateLanguageList::OnLanguageListFetchComplete, +- base::Unretained(this))); +- if (!result) +- NotifyEvent(__LINE__, "Request is omitted due to retry limit"); +- } + } + + void TranslateLanguageList::SetResourceRequestsAllowed(bool allowed) { + --- ./chrome/browser/spellchecker/spellcheck_hunspell_dictionary.cc +++ ./chrome/browser/spellchecker/spellcheck_hunspell_dictionary.cc.new @@ -145,7 +145,6 @@ diff --git a/resources/common/patches/inox-patchset/disable-update-pings.patch b/resources/common/patches/inox-patchset/disable-update-pings.patch new file mode 100644 index 00000000..478530f5 --- /dev/null +++ b/resources/common/patches/inox-patchset/disable-update-pings.patch @@ -0,0 +1,19 @@ +--- ./components/component_updater/configurator_impl.cc ++++ ./components/component_updater/configurator_impl.cc.new +@@ -140,16 +140,6 @@ + + std::vector ConfiguratorImpl::UpdateUrl() const { + std::vector urls; +- if (url_source_override_.is_valid()) { +- urls.push_back(GURL(url_source_override_)); +- return urls; +- } +- +- urls.push_back(GURL(kUpdaterDefaultUrl)); +- urls.push_back(GURL(kUpdaterFallbackUrl)); +- if (require_encryption_) +- update_client::RemoveUnsecureUrls(&urls); +- + return urls; + } + diff --git a/resources/common/patches/ungoogled-chromium/disable-web-resource-service.patch b/resources/common/patches/inox-patchset/disable-web-resource-service.patch similarity index 100% rename from resources/common/patches/ungoogled-chromium/disable-web-resource-service.patch rename to resources/common/patches/inox-patchset/disable-web-resource-service.patch diff --git a/resources/common/patches/inox-patchset/modify-default-prefs.patch b/resources/common/patches/inox-patchset/modify-default-prefs.patch index e05de7ed..e8a9068f 100644 --- a/resources/common/patches/inox-patchset/modify-default-prefs.patch +++ b/resources/common/patches/inox-patchset/modify-default-prefs.patch @@ -1,3 +1,96 @@ +--- ./chrome/browser/chrome_content_browser_client.cc ++++ ./chrome/browser/chrome_content_browser_client.cc.new +@@ -749,7 +749,7 @@ + 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); + } + + +--- ./chrome/browser/ui/browser_ui_prefs.cc ++++ ./chrome/browser/ui/browser_ui_prefs.cc.new +@@ -83,11 +83,11 @@ + 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); + + +--- ./chrome/browser/net/prediction_options.cc ++++ ./chrome/browser/net/prediction_options.cc.new +@@ -30,7 +30,7 @@ + return NetworkPredictionStatus::ENABLED; + } + default: +- DCHECK_EQ(NETWORK_PREDICTION_NEVER, network_prediction_options); ++ //DCHECK_EQ(NETWORK_PREDICTION_NEVER, network_prediction_options); + return NetworkPredictionStatus::DISABLED_ALWAYS; + } + } + + +--- ./chrome/browser/net/prediction_options.h ++++ ./chrome/browser/net/prediction_options.h.new +@@ -23,7 +23,7 @@ + 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 { + + +--- ./chrome/browser/background/background_mode_manager.cc ++++ ./chrome/browser/background/background_mode_manager.cc.new +@@ -354,7 +354,7 @@ + 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) { + + +--- ./components/content_settings/core/browser/cookie_settings.cc ++++ ./components/content_settings/core/browser/cookie_settings.cc.new +@@ -82,7 +82,7 @@ + void CookieSettings::RegisterProfilePrefs( + user_prefs::PrefRegistrySyncable* registry) { + registry->RegisterBooleanPref( +- prefs::kBlockThirdPartyCookies, false, ++ prefs::kBlockThirdPartyCookies, true, + user_prefs::PrefRegistrySyncable::SYNCABLE_PREF); + } + + +--- ./chrome/browser/ui/navigation_correction_tab_observer.cc ++++ ./chrome/browser/ui/navigation_correction_tab_observer.cc.new +@@ -56,7 +56,7 @@ + void NavigationCorrectionTabObserver::RegisterProfilePrefs( + user_prefs::PrefRegistrySyncable* prefs) { + prefs->RegisterBooleanPref(prefs::kAlternateErrorPagesEnabled, +- true, ++ false, + user_prefs::PrefRegistrySyncable::SYNCABLE_PREF); + } + + --- ./components/autofill/core/browser/autofill_manager.cc +++ ./components/autofill/core/browser/autofill_manager.cc.new @@ -177,7 +177,7 @@ @@ -11,6 +104,19 @@ false); +--- ./chrome/browser/resources/options/reset_profile_settings_overlay.html ++++ ./chrome/browser/resources/options/reset_profile_settings_overlay.html.new +@@ -26,7 +26,7 @@ +
+