morgan/helium
1
0
Fork 0
mirror of https://github.com/morgan9e/helium synced 2026-04-14 08:24:04 +09:00
Code Issues Packages Projects Releases Wiki Activity

Update Inox and Iridium patches to Chrome 53

Browse Source 
Update README.md
This commit is contained in:
Eloston
2016-09-10 01:42:30 -07:00
parent b4c9c9a317
commit df72308ce8
47 changed files with 1096 additions and 1325 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
README.md
View File

@@ -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/)

584
resources/common/patches/inox-patchset/add-duckduckgo-search-engine.patch Normal file
View File

@@ -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,

14
resources/common/patches/inox-patchset/chromium-sandbox-pie.patch Normal file
View File

@@ -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': [
'../..',

10
resources/common/patches/inox-patchset/chromium-widevine.patch Normal file
View File

@@ -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_

2
resources/common/patches/inox-patchset/disable-autofill-download-manager.patch
View File

@@ -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");
}

21
resources/common/patches/inox-patchset/disable-battery-status-service.patch Normal file
View File

@@ -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);
}

70
resources/common/patches/inox-patchset/disable-default-extensions.patch
View File

@@ -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<const Extension> 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)

32
resources/common/patches/inox-patchset/disable-gcm-status-check.patch Normal file
View File

@@ -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(

17
resources/common/patches/inox-patchset/disable-google-ipv6-probes.patch Normal file
View File

@@ -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

2
resources/common/patches/inox-patchset/disable-google-url-tracker.patch
View File

@@ -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";

10
resources/common/patches/inox-patchset/disable-missing-key-warning.patch Normal file
View File

@@ -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;

39
resources/common/patches/inox-patchset/disable-translation-lang-fetch.patch
View File

@@ -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 @@

19
resources/common/patches/inox-patchset/disable-update-pings.patch Normal file
View File

@@ -0,0 +1,19 @@
--- ./components/component_updater/configurator_impl.cc
+++ ./components/component_updater/configurator_impl.cc.new
@@ -140,16 +140,6 @@
std::vector<GURL> ConfiguratorImpl::UpdateUrl() const {
std::vector<GURL> 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;
}

0
resources/common/patches/ungoogled-chromium/disable-web-resource-service.patch → resources/common/patches/inox-patchset/disable-web-resource-service.patch
View File

144
resources/common/patches/inox-patchset/modify-default-prefs.patch
View File

@@ -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 @@
<div id="feedback-bar"
class="gray-bottom-bar checkbox controlled-setting-with-label">
<label>
- <input id="send-settings" type="checkbox" checked>
+ <input id="send-settings" type="checkbox">
<span>
<span i18n-content="resetProfileSettingsFeedback"></span>
<span id="expand-feedback"></span>
--- ./chrome/browser/io_thread.cc
+++ ./chrome/browser/io_thread.cc.new
@@ -1014,7 +1014,7 @@
@@ -45,6 +151,20 @@
}
--- ./chrome/browser/signin/signin_promo.cc
+++ ./chrome/browser/signin/signin_promo.cc.new
@@ -352,8 +352,8 @@
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);
}
--- ./components/bookmarks/browser/bookmark_utils.cc
+++ ./components/bookmarks/browser/bookmark_utils.cc.new
@@ -430,12 +430,12 @@
@@ -66,6 +186,15 @@
--- ./chrome/browser/profiles/profile.cc
+++ ./chrome/browser/profiles/profile.cc.new
@@ -77,7 +77,7 @@
void Profile::RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
registry->RegisterBooleanPref(
prefs::kSearchSuggestEnabled,
- true,
+ false,
user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
#if BUILDFLAG(ANDROID_JAVA_UI)
registry->RegisterStringPref(
@@ -89,7 +89,7 @@
registry->RegisterStringPref(prefs::kSessionExitType, std::string());
registry->RegisterBooleanPref(
@@ -97,3 +226,18 @@
xmpp_ping_enabled_ = prefs->GetBoolean(
prefs::kCloudPrintXmppPingEnabled, false);
--- ./chrome/browser/ui/webui/local_discovery/local_discovery_ui.cc
+++ ./chrome/browser/ui/webui/local_discovery/local_discovery_ui.cc.new
@@ -142,10 +142,6 @@
user_prefs::PrefRegistrySyncable* registry) {
registry->RegisterBooleanPref(
prefs::kLocalDiscoveryNotificationsEnabled,
-#if defined(OS_WIN)
false,
-#else
- true,
-#endif
user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
}

21
resources/common/patches/inox-patchset/restore-classic-ntp.patch Normal file
View File

@@ -0,0 +1,21 @@
--- ./chrome/browser/search/search.cc
+++ ./chrome/browser/search/search.cc.new
@@ -260,17 +260,7 @@
template_url->new_tab_url_ref(), UIThreadSearchTermsData(profile),
false, false);
NewTabURLState state = IsValidNewTabURL(profile, search_provider_url);
- switch (state) {
- case NEW_TAB_URL_VALID:
- // We can use the search provider's page.
- return NewTabURLDetails(search_provider_url, state);
- case NEW_TAB_URL_INCOGNITO:
- // Incognito has its own New Tab.
- return NewTabURLDetails(GURL(), state);
- default:
- // Use the local New Tab otherwise.
- return NewTabURLDetails(local_url, state);
- }
+ return NewTabURLDetails(local_url, state);
}
GURL url;

236
resources/common/patches/iridium-browser/all-add-trk-prefixes-to-possibly-evil-connections.patch
View File

@@ -445,24 +445,6 @@ index 66662cb..c211a47 100644
// The filename under which we'll store the blacklist (in the user data dir).
const char kBlacklistFilename[] = "su-blacklist.bin";
diff --git a/chrome/browser/ui/app_list/search/people/people_provider.cc b/chrome/browser/ui/app_list/search/people/people_provider.cc
index 8efc2ec..c58a59a 100644
--- a/chrome/browser/ui/app_list/search/people/people_provider.cc
+++ b/chrome/browser/ui/app_list/search/people/people_provider.cc
@@ -35,11 +35,11 @@ const char kKeyItems[] = "items";
const char kAccessTokenField[] = "access_token";
const char kQueryField[] = "query";
const char kPeopleSearchUrl[] =
- "https://www.googleapis.com/plus/v2whitelisted/people/autocomplete";
+ "trk:239:https://www.googleapis.com/plus/v2whitelisted/people/autocomplete";
// OAuth2 scope for access to the Google+ People Search API.
const char kPeopleSearchOAuth2Scope[] =
- "https://www.googleapis.com/auth/plus.peopleapi.readwrite";
+ "trk:240:https://www.googleapis.com/auth/plus.peopleapi.readwrite";
} // namespace
diff --git a/chrome/browser/ui/views/outdated_upgrade_bubble_view.cc b/chrome/browser/ui/views/outdated_upgrade_bubble_view.cc
index 8b786b5..391c9bd 100644
--- a/chrome/browser/ui/views/outdated_upgrade_bubble_view.cc
@@ -480,31 +462,40 @@ diff --git a/chrome/browser/ui/website_settings/mock_permission_bubble_request.c
index 7749547..6a78777 100644
--- a/chrome/browser/ui/website_settings/mock_permission_bubble_request.cc
+++ b/chrome/browser/ui/website_settings/mock_permission_bubble_request.cc
@@ -15,7 +15,7 @@ MockPermissionBubbleRequest::MockPermissionBubbleRequest()
text_ = base::ASCIIToUTF16("test");
accept_label_ = base::ASCIIToUTF16("button");
deny_label_ = base::ASCIIToUTF16("button");
- origin_ = GURL("http://www.google.com");
+ origin_ = GURL("trk:243:http://www.google.com");
}
@@ -12,7 +12,7 @@ MockPermissionBubbleRequest::MockPermissionBubbleRequest()
: MockPermissionBubbleRequest("test",
"button",
"button",
- GURL("http://www.google.com"),
+ GURL("trk:243:http://www.google.com"),
PermissionBubbleType::UNKNOWN) {}
MockPermissionBubbleRequest::MockPermissionBubbleRequest(
@@ -26,7 +26,7 @@ MockPermissionBubbleRequest::MockPermissionBubbleRequest(
text_ = base::UTF8ToUTF16(text);
accept_label_ = base::ASCIIToUTF16("button");
deny_label_ = base::ASCIIToUTF16("button");
- origin_ = GURL("http://www.google.com");
+ origin_ = GURL("trk:244:http://www.google.com");
}
@@ -20,7 +20,7 @@ MockPermissionBubbleRequest::MockPermissionBubbleRequest(
: MockPermissionBubbleRequest(text,
"button",
"button",
- GURL("http://www.google.com"),
+ GURL("trk:244:http://www.google.com"),
PermissionBubbleType::UNKNOWN) {}
MockPermissionBubbleRequest::MockPermissionBubbleRequest(
@@ -51,7 +51,7 @@ MockPermissionBubbleRequest::MockPermissionBubbleRequest(
text_ = base::UTF8ToUTF16(text);
accept_label_ = base::UTF8ToUTF16(accept_label);
deny_label_ = base::UTF8ToUTF16(deny_label);
- origin_ = GURL("http://www.google.com");
+ origin_ = GURL("trk:245:http://www.google.com");
}
@@ -28,7 +28,7 @@ MockPermissionBubbleRequest::MockPermissionBubbleRequest(
: MockPermissionBubbleRequest(text,
"button",
"button",
- GURL("http://www.google.com"),
+ GURL("trk:245:http://www.google.com"),
bubble_type) {}
MockPermissionBubbleRequest::MockPermissionBubbleRequest(
@@ -47,7 +47,7 @@ MockPermissionBubbleRequest::MockPermissionBubbleRequest(
: MockPermissionBubbleRequest(text,
accept_label,
deny_label,
- GURL("http://www.google.com"),
+ GURL("trk:245:http://www.google.com"),
PermissionBubbleType::UNKNOWN) {}
MockPermissionBubbleRequest::~MockPermissionBubbleRequest() {}
diff --git a/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc b/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc
@@ -533,19 +524,6 @@ index 5161f9b..4110f7b 100644
#endif
std::string SkColorToRGBAString(SkColor color) {
diff --git a/chrome/chrome_watcher/chrome_watcher_main.cc b/chrome/chrome_watcher/chrome_watcher_main.cc
index 1976c7a..e388e38 100644
--- a/chrome/chrome_watcher/chrome_watcher_main.cc
+++ b/chrome/chrome_watcher/chrome_watcher_main.cc
@@ -204,7 +204,7 @@ void OnWindowEvent(
void GetKaskoCrashServerUrl(base::string16* crash_server) {
const char kKaskoCrashServerUrl[] = "KASKO_CRASH_SERVER_URL";
static const wchar_t kDefaultKaskoCrashServerUrl[] =
- L"https://clients2.google.com/cr/report";
+ L"trk:109:https://clients2.google.com/cr/report";
auto env = base::Environment::Create();
std::string env_var;
diff --git a/chrome/common/extensions/chrome_extensions_client.cc b/chrome/common/extensions/chrome_extensions_client.cc
index 81d942b..86390ac 100644
--- a/chrome/common/extensions/chrome_extensions_client.cc
@@ -775,19 +753,6 @@ index 06c0866..1a2071a 100644
// Name of the GCM account tracker for the OAuth2TokenService.
const char kGCMAccountTrackerName[] = "gcm_account_tracker";
// Minimum token validity when sending to GCM groups server.
diff --git a/components/google/core/browser/google_url_tracker.cc b/components/google/core/browser/google_url_tracker.cc
index 4136f962..4628cdc 100644
--- a/components/google/core/browser/google_url_tracker.cc
+++ b/components/google/core/browser/google_url_tracker.cc
@@ -34,7 +34,7 @@
* (So the naming problem was spotted, yet remains unfixed even today…)
*/
const char GoogleURLTracker::kDefaultGoogleHomepage[] =
- "https://www.google.com/";
+ "trk:192:https://www.google.com/";
const char GoogleURLTracker::kSearchDomainCheckURL[] =
/* trk:193: */ "https://www.google.com/searchdomaincheck?format=domain&type=chrome";
diff --git a/components/history/core/browser/web_history_service.cc b/components/history/core/browser/web_history_service.cc
index 46177dc..b9331a6 100644
--- a/components/history/core/browser/web_history_service.cc
@@ -839,15 +804,18 @@ diff --git a/components/metrics/url_constants.cc b/components/metrics/url_consta
index 55d9e13..5f17829 100644
--- a/components/metrics/url_constants.cc
+++ b/components/metrics/url_constants.cc
@@ -6,7 +6,7 @@
namespace metrics {
@@ -10,9 +10,9 @@ namespace metrics {
#if defined(OS_ANDROID)
const char kDefaultMetricsServerUrl[] =
- "https://clientservices.googleapis.com/uma/v2";
+ "trk:265:https://clientservices.googleapis.com/uma/v2";
#else
-const char kDefaultMetricsServerUrl[] = "https://clients4.google.com/uma/v2";
+const char kDefaultMetricsServerUrl[] = "trk:265:https://clients4.google.com/uma/v2";
const char kDefaultMetricsMimeType[] = "application/vnd.chrome.uma";
#endif
} // namespace metrics
const char kDefaultMetricsMimeType[] = "application/vnd.chrome.uma";
diff --git a/components/password_manager/core/browser/password_store.cc b/components/password_manager/core/browser/password_store.cc
index bb424b2..0934dec 100644
--- a/components/password_manager/core/browser/password_store.cc
@@ -976,23 +944,10 @@ index dce446a..87b1301 100644
+ "trk:142:https://clients4.google.com/chrome-variations/seed";
} // namespace variations
diff --git a/content/browser/speech/google_one_shot_remote_engine.cc b/content/browser/speech/google_one_shot_remote_engine.cc
index 97743c9..3993252 100644
--- a/content/browser/speech/google_one_shot_remote_engine.cc
+++ b/content/browser/speech/google_one_shot_remote_engine.cc
@@ -29,7 +29,7 @@ namespace content {
namespace {
const char* const kDefaultSpeechRecognitionUrl =
- "https://www.google.com/speech-api/v1/recognize?xjerr=1&client=chromium&";
+ "trk:185:https://www.google.com/speech-api/v1/recognize?xjerr=1&client=chromium&";
const char* const kStatusString = "status";
const char* const kHypothesesString = "hypotheses";
const char* const kUtteranceString = "utterance";
diff --git a/content/browser/speech/google_streaming_remote_engine.cc b/content/browser/speech/google_streaming_remote_engine.cc
index 2f7e365..bef7570 100644
--- a/content/browser/speech/google_streaming_remote_engine.cc
+++ b/content/browser/speech/google_streaming_remote_engine.cc
--- a/content/browser/speech/speech_recognition_engine.cc
+++ b/content/browser/speech/speech_recognition_engine.cc
@@ -33,7 +33,7 @@ namespace content {
namespace {
@@ -1127,62 +1082,93 @@ index 657fd3f..5fa47f5 100644
const buzz::QName QN_GOOGLE_AUTH_CLIENT_USES_FULL_BIND_RESULT(
diff --git a/net/cert/ct_known_logs_static.h b/net/cert/ct_known_logs_static.h
index 8452ece..883b4df 100644
--- a/net/cert/ct_known_logs_static.h
+++ b/net/cert/ct_known_logs_static.h
@@ -24,7 +24,7 @@ const CTLogInfo kCTLogList[] = {
--- a/net/cert/ct_known_logs_static-inc.h
+++ b/net/cert/ct_known_logs_static-inc.h
@@ -23,35 +23,35 @@ const CTLogInfo kCTLogList[] = {
"\x0c\xe8\x41\x46\xe8\x81\x01\x1b\x15\xe1\x4b\xf1\x1b\x62\xdd\x36\x0a"
"\x08\x18\xba\xed\x0b\x35\x84\xd0\x9e\x40\x3c\x2d\x9e\x9b\x82\x65\xbd"
"\x1f\x04\x10\x41\x4c\xa0",
91,
"Google 'Pilot' log",
- "https://ct.googleapis.com/pilot/"},
+ "trk:300:https://ct.googleapis.com/pilot/"},
- 91, "Google 'Pilot' log", "https://ct.googleapis.com/pilot/"},
+ 91, "Google 'Pilot' log", "trk:300:https://ct.googleapis.com/pilot/"},
{"\x30\x59\x30\x13\x06\x07\x2a\x86\x48\xce\x3d\x02\x01\x06\x08\x2a\x86"
"\x48\xce\x3d\x03\x01\x07\x03\x42\x00\x04\xd7\xf4\xcc\x69\xb2\xe4\x0e"
"\x90\xa3\x8a\xea\x5a\x70\x09\x4f\xef\x13\x62\xd0\x8d\x49\x60\xff\x1b"
@@ -33,7 +33,7 @@ const CTLogInfo kCTLogList[] = {
"\x40\x50\x07\x0c\x6d\x71\x86\xda\x25\x49\x8d\x65\xe1\x08\x0d\x47\x34"
"\x6b\xbd\x27\xbc\x96\x21\x3e\x34\xf5\x87\x76\x31\xb1\x7f\x1d\xc9\x85"
"\x3b\x0d\xf7\x1f\x3f\xe9",
91,
"Google 'Aviator' log",
- "https://ct.googleapis.com/aviator/"},
+ "trk:301:https://ct.googleapis.com/aviator/"},
- 91, "Google 'Aviator' log", "https://ct.googleapis.com/aviator/"},
+ 91, "Google 'Aviator' log", "trk:301:https://ct.googleapis.com/aviator/"},
{"\x30\x59\x30\x13\x06\x07\x2a\x86\x48\xce\x3d\x02\x01\x06\x08\x2a\x86"
"\x48\xce\x3d\x03\x01\x07\x03\x42\x00\x04\x02\x46\xc5\xbe\x1b\xbb\x82"
"\x40\x16\xe8\xc1\xd2\xac\x19\x69\x13\x59\xf8\xf8\x70\x85\x46\x40\xb9"
@@ -42,7 +42,7 @@ const CTLogInfo kCTLogList[] = {
"\x38\xb0\x23\x82\xa8\x64\x4c\x7f\xbf\xbb\x34\x9f\x4a\x5f\x28\x8a\xcf"
"\x19\xc4\x00\xf6\x36\x06\x93\x65\xed\x4c\xf5\xa9\x21\x62\x5a\xd8\x91"
"\xeb\x38\x24\x40\xac\xe8",
91,
"DigiCert Log Server",
- "https://ct1.digicert-ct.com/log/"},
+ "trk:302:https://ct1.digicert-ct.com/log/"},
- 91, "DigiCert Log Server", "https://ct1.digicert-ct.com/log/"},
+ 91, "DigiCert Log Server", "trk:302:https://ct1.digicert-ct.com/log/"},
{"\x30\x59\x30\x13\x06\x07\x2a\x86\x48\xce\x3d\x02\x01\x06\x08\x2a\x86"
"\x48\xce\x3d\x03\x01\x07\x03\x42\x00\x04\x20\x5b\x18\xc8\x3c\xc1\x8b"
"\xb3\x31\x08\x00\xbf\xa0\x90\x57\x2b\xb7\x47\x8c\x6f\xb5\x68\xb0\x8e"
@@ -51,7 +51,7 @@ const CTLogInfo kCTLogList[] = {
"\x90\x78\xe9\xa0\x73\xea\x4f\x28\x21\x2e\x9c\xc0\xf4\x16\x1b\xaa\xf9"
"\xd5\xd7\xa9\x80\xc3\x4e\x2f\x52\x3c\x98\x01\x25\x46\x24\x25\x28\x23"
"\x77\x2d\x05\xc2\x40\x7a",
91,
"Google 'Rocketeer' log",
- "https://ct.googleapis.com/rocketeer/"},
+ "trk:303:https://ct.googleapis.com/rocketeer/"},
{"\x30\x59\x30\x13\x06\x07\x2a\x86\x48\xce\x3d\x02\x01\x06\x08\x2a\x86"
"\x48\xce\x3d\x03\x01\x07\x03\x42\x00\x04\x0b\x23\xcb\x85\x62\x98\x61"
"\x48\x04\x73\xeb\x54\x5d\xf3\xd0\x07\x8c\x2d\x19\x2d\x8c\x36\xf5\xeb"
@@ -60,7 +60,7 @@ const CTLogInfo kCTLogList[] = {
"\xd0\x4a\xc2\x66\xdb\x48",
91,
"Certly.IO log",
- "https://log.certly.io/"},
+ "trk:304:https://log.certly.io/"},
{"\x30\x59\x30\x13\x06\x07\x2a\x86\x48\xce\x3d\x02\x01\x06\x08\x2a\x86"
"\x48\xce\x3d\x03\x01\x07\x03\x42\x00\x04\x27\x64\x39\x0c\x2d\xdc\x50"
"\x18\xf8\x21\x00\xa2\x0e\xed\x2c\xea\x3e\x75\xba\x9f\x93\x64\x09\x00"
@@ -69,7 +69,7 @@ const CTLogInfo kCTLogList[] = {
"\xf6\x07\x76\xe0\xee\xbe",
91,
"Izenpe log",
- "https://ct.izenpe.com/"},
+ "trk:305:https://ct.izenpe.com/"},
- 91, "Google 'Rocketeer' log", "https://ct.googleapis.com/rocketeer/"},
+ 91, "Google 'Rocketeer' log", "trk:303:https://ct.googleapis.com/rocketeer/"},
{"\x30\x59\x30\x13\x06\x07\x2a\x86\x48\xce\x3d\x02\x01\x06\x08\x2a\x86"
"\x48\xce\x3d\x03\x01\x07\x03\x42\x00\x04\x96\xea\xac\x1c\x46\x0c\x1b"
"\x55\xdc\x0d\xfc\xb5\x94\x27\x46\x57\x42\x70\x3a\x69\x18\xe2\xbf\x3b"
"\xc4\xdb\xab\xa0\xf4\xb6\x6c\xc0\x53\x3f\x4d\x42\x10\x33\xf0\x58\x97"
"\x8f\x6b\xbe\x72\xf4\x2a\xec\x1c\x42\xaa\x03\x2f\x1a\x7e\x28\x35\x76"
"\x99\x08\x3d\x21\x14\x86",
- 91, "Symantec log", "https://ct.ws.symantec.com/"},
+ 91, "Symantec log", "trk:304:https://ct.ws.symantec.com/"},
{"\x30\x82\x01\x22\x30\x0d\x06\x09\x2a\x86\x48\x86\xf7\x0d\x01\x01\x01"
"\x05\x00\x03\x82\x01\x0f\x00\x30\x82\x01\x0a\x02\x82\x01\x01\x00\xa2"
"\x5a\x48\x1f\x17\x52\x95\x35\xcb\xa3\x5b\x3a\x1f\x53\x82\x76\x94\xa3"
@@ -70,14 +70,14 @@ const CTLogInfo kCTLogList[] = {
"\x05\xbf\x5f\xae\x94\x97\xdb\x5f\x64\xd4\xee\x16\x8b\xa3\x84\x6c\x71"
"\x2b\xf1\xab\x7f\x5d\x0d\x32\xee\x04\xe2\x90\xec\x41\x9f\xfb\x39\xc1"
"\x02\x03\x01\x00\x01",
- 294, "Venafi log", "https://ctlog.api.venafi.com/"},
+ 294, "Venafi log", "trk:305:https://ctlog.api.venafi.com/"},
{"\x30\x59\x30\x13\x06\x07\x2a\x86\x48\xce\x3d\x02\x01\x06\x08\x2a\x86"
"\x48\xce\x3d\x03\x01\x07\x03\x42\x00\x04\xea\x95\x9e\x02\xff\xee\xf1"
"\x33\x6d\x4b\x87\xbc\xcd\xfd\x19\x17\x62\xff\x94\xd3\xd0\x59\x07\x3f"
"\x02\x2d\x1c\x90\xfe\xc8\x47\x30\x3b\xf1\xdd\x0d\xb8\x11\x0c\x5d\x1d"
"\x86\xdd\xab\xd3\x2b\x46\x66\xfb\x6e\x65\xb7\x3b\xfd\x59\x68\xac\xdf"
"\xa6\xf8\xce\xd2\x18\x4d",
- 91, "Symantec 'Vega' log", "https://vega.ws.symantec.com/"},
+ 91, "Symantec 'Vega' log", "trk:https://vega.ws.symantec.com/"},
{"\x30\x82\x01\x22\x30\x0d\x06\x09\x2a\x86\x48\x86\xf7\x0d\x01\x01\x01"
"\x05\x00\x03\x82\x01\x0f\x00\x30\x82\x01\x0a\x02\x82\x01\x01\x00\xbf"
"\xb5\x08\x61\x9a\x29\x32\x04\xd3\x25\x63\xe9\xd8\x85\xe1\x86\xe0\x1f"
@@ -96,7 +96,7 @@ const CTLogInfo kCTLogList[] = {
"\x6f\xdf\x3c\x2c\x43\x57\xa1\x47\x0c\x91\x04\xf4\x75\x4d\xda\x89\x81"
"\xa4\x14\x06\x34\xb9\x98\xc3\xda\xf1\xfd\xed\x33\x36\xd3\x16\x2d\x35"
"\x02\x03\x01\x00\x01",
- 294, "CNNIC CT log", "https://ctserver.cnnic.cn/"}};
+ 294, "CNNIC CT log", "trk:https://ctserver.cnnic.cn/"}};
// Information related to previously-qualified, but now disqualified, CT
// logs.
@@ -123,7 +123,7 @@ const DisqualifiedCTLogInfo kDisqualifiedCTLogList[] = {
"\x11\xc4\x11\x17\xab\x5c\xcf\x0f\x74\xac\xb5\x97\x90\x93\x00\x5b\xb8"
"\xeb\xf7\x27\x3d\xd9\xb2\x0a\x81\x5f\x2f\x0d\x75\x38\x94\x37\x99\x1e"
"\xf6\x07\x76\xe0\xee\xbe",
- 91, "Izenpe log", "https://ct.izenpe.com/"},
+ 91, "Izenpe log", "trk:https://ct.izenpe.com/"},
// 2016-05-30 00:00:00 UTC
base::TimeDelta::FromSeconds(1464566400),
},
@@ -136,7 +136,7 @@ const DisqualifiedCTLogInfo kDisqualifiedCTLogList[] = {
"\x8f\x01\x42\x0a\x7c\x98\x26\x27\xc1\xb5\xdd\x92\x93\xb0\xae\xf8\x9b"
"\x3d\x0c\xd8\x4c\x4e\x1d\xf9\x15\xfb\x47\x68\x7b\xba\x66\xb7\x25\x9c"
"\xd0\x4a\xc2\x66\xdb\x48",
- 91, "Certly.IO log", "https://log.certly.io/"},
+ 91, "Certly.IO log", "trk:https://log.certly.io/"},
// 2016-04-15 00:00:00 UTC
base::TimeDelta::FromSeconds(1460678400),
},
diff --git a/remoting/base/breakpad_mac.mm b/remoting/base/breakpad_mac.mm
index 1dbd11f..579bfd5 100644
--- a/remoting/base/breakpad_mac.mm

43
resources/common/patches/iridium-browser/autofill-disable-autofill-download-manager.patch
View File

@@ -1,43 +0,0 @@
From d1ea83d29a868c891b3a75de56f37a387fec905f Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Thu, 11 Sep 2014 16:37:32 +0200
Subject: [PATCH 09/55] autofill: disable autofill download manager
Disables the autofill download manager (trk:158).
---
components/autofill/core/browser/autofill_download_manager.cc | 2 +-
components/autofill/core/browser/autofill_manager.cc | 2 ++
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/components/autofill/core/browser/autofill_download_manager.cc b/components/autofill/core/browser/autofill_download_manager.cc
index 4046a84..b634fa2 100644
--- a/components/autofill/core/browser/autofill_download_manager.cc
+++ b/components/autofill/core/browser/autofill_download_manager.cc
@@ -86,7 +86,7 @@ std::string RequestTypeToString(AutofillDownloadManager::RequestType type) {
}
GURL GetRequestUrl(AutofillDownloadManager::RequestType request_type) {
- return GURL("https://clients1.google.com/tbproxy/af/" +
+ return GURL("trk:158:https://clients1.google.com/tbproxy/af/" +
RequestTypeToString(request_type) + "?client=" + kClientName);
}
diff --git a/components/autofill/core/browser/autofill_manager.cc b/components/autofill/core/browser/autofill_manager.cc
index 6f4908c..5eb090a 100644
--- a/components/autofill/core/browser/autofill_manager.cc
+++ b/components/autofill/core/browser/autofill_manager.cc
@@ -203,9 +203,11 @@ AutofillManager::AutofillManager(
external_delegate_(NULL),
test_delegate_(NULL),
weak_ptr_factory_(this) {
+#if 0
if (enable_download_manager == ENABLE_AUTOFILL_DOWNLOAD_MANAGER) {
download_manager_.reset(new AutofillDownloadManager(driver, this));
}
+#endif
CountryNames::SetLocaleString(app_locale_);
}
--
2.6.6

50
resources/common/patches/iridium-browser/battery_status_service-disable-more-privacy-nightmar.patch
View File

@@ -1,50 +0,0 @@
From 57911b28cd19157e3af8ae13138977e90402bfc5 Mon Sep 17 00:00:00 2001
From: Joachim Bauch <jojo@struktur.de>
Date: Tue, 4 Aug 2015 15:15:53 +0200
Subject: [PATCH 51/55] battery_status_service: disable more privacy nightmares
The W3C Battery Status API[1] has quite a laughable statement:
"The information disclosed has minimal impact on privacy or
fingerprinting, and therefore is exposed without permission grants".
Along comes a paper "The leaking battery, A privacy analysis of the
HTML5 Battery Status API."
Clean up after the W3C and disable the battery status updater which
could be used to identity users[2].
[1] http://www.w3.org/TR/battery-status/
[2] https://eprint.iacr.org/2015/616.pdf
References: https://github.com/iridium-browser/iridium-browser/issues/40
---
device/battery/battery_status_service.cc | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/device/battery/battery_status_service.cc b/device/battery/battery_status_service.cc
index 6b3c34c..48b9548 100644
--- 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);
}
--
2.6.6

25
resources/common/patches/iridium-browser/browser-ui-disable-warning-about-missing-API-keys.patch
View File

@@ -1,25 +0,0 @@
From a9ca3be85670f6dcdcfc18454b25d8e90b82a19a Mon Sep 17 00:00:00 2001
From: Joachim Bauch <bauch@struktur.de>
Date: Tue, 9 Dec 2014 17:19:41 +0100
Subject: [PATCH 07/55] browser-ui: disable warning about missing API keys
We do not want to use the services anyway ;)
---
chrome/browser/ui/startup/google_api_keys_infobar_delegate.cc | 1 +
1 file changed, 1 insertion(+)
diff --git a/chrome/browser/ui/startup/google_api_keys_infobar_delegate.cc b/chrome/browser/ui/startup/google_api_keys_infobar_delegate.cc
index 018243f..38a8b7d 100644
--- a/chrome/browser/ui/startup/google_api_keys_infobar_delegate.cc
+++ b/chrome/browser/ui/startup/google_api_keys_infobar_delegate.cc
@@ -15,6 +15,7 @@
// static
void GoogleApiKeysInfoBarDelegate::Create(InfoBarService* infobar_service) {
+ return;
if (google_apis::HasKeysConfigured())
return;
--
2.6.6

30
resources/common/patches/iridium-browser/build-build-the-sandbox-with-PIE.patch
View File

@@ -1,30 +0,0 @@
From 858434becf02f8edcd53be9902fd14a726b5c8b1 Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Thu, 29 Jan 2015 10:39:51 +0100
Subject: [PATCH 31/55] build: build the sandbox with PIE
(Position Independent Executable.)
This patch originally from openSUSE, chromium-sandbox-pie.patch.
---
sandbox/linux/sandbox_linux.gypi | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/sandbox/linux/sandbox_linux.gypi b/sandbox/linux/sandbox_linux.gypi
index c19bdb1..fb8abf3 100644
--- a/sandbox/linux/sandbox_linux.gypi
+++ b/sandbox/linux/sandbox_linux.gypi
@@ -205,7 +205,10 @@
],
'cflags': [
# For ULLONG_MAX
- '-std=gnu99',
+ '-std=gnu99 -fPIE',
+ ],
+ 'ldflags': [
+ '-pie',
],
'include_dirs': [
'../..',
--
2.6.6

65
resources/common/patches/iridium-browser/cloud-print-disable-in-prefs-and-component-loader.patch
View File

@@ -1,65 +0,0 @@
From daa9f4d432e7b8c6f39df343cbcc20274550a75f Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Sat, 13 Sep 2014 16:55:12 +0200
Subject: [PATCH 15/55] cloud-print: disable in prefs and component loader
Cloud Print should normally be autodisabled if no printers are shared.
But maybe that is not enough(?) Probably also needs to gain a checkbox
in the settings. Revisit..]
Also changes the setting for notifications about new cloud printers to
be off by default.
---
chrome/browser/extensions/component_loader.cc | 2 ++
chrome/browser/ui/browser_ui_prefs.cc | 2 +-
chrome/browser/ui/webui/local_discovery/local_discovery_ui.cc | 4 ----
3 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/chrome/browser/extensions/component_loader.cc b/chrome/browser/extensions/component_loader.cc
index 932ebbd..dfcfcb9 100644
--- a/chrome/browser/extensions/component_loader.cc
+++ b/chrome/browser/extensions/component_loader.cc
@@ -554,10 +554,12 @@ void ComponentLoader::AddDefaultComponentExtensions(
DCHECK(!skip_session_components);
Add(IDR_BOOKMARKS_MANIFEST,
base::FilePath(FILE_PATH_LITERAL("bookmark_manager")));
+#if 0
// Cloud Print component app. Not required on Chrome OS.
Add(IDR_CLOUDPRINT_MANIFEST,
base::FilePath(FILE_PATH_LITERAL("cloud_print")));
#endif
+#endif
if (!skip_session_components) {
AddWebStoreApp();
diff --git a/chrome/browser/ui/browser_ui_prefs.cc b/chrome/browser/ui/browser_ui_prefs.cc
index 7fc4c5c..463c56c 100644
--- a/chrome/browser/ui/browser_ui_prefs.cc
+++ b/chrome/browser/ui/browser_ui_prefs.cc
@@ -89,7 +89,7 @@ void RegisterBrowserUserPrefs(user_prefs::PrefRegistrySyncable* registry) {
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/webui/local_discovery/local_discovery_ui.cc b/chrome/browser/ui/webui/local_discovery/local_discovery_ui.cc
index efc476a..168153f 100644
--- a/chrome/browser/ui/webui/local_discovery/local_discovery_ui.cc
+++ b/chrome/browser/ui/webui/local_discovery/local_discovery_ui.cc
@@ -142,10 +142,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);
}
--
2.6.6

33
resources/common/patches/iridium-browser/dns-send-IPv6-connectivity-probes-to-RIPE-DNS-rather.patch
View File

@@ -1,33 +0,0 @@
From b543994e7d8b84f99ceea2e30e80bae9514d51e4 Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Mon, 15 Sep 2014 10:58:42 +0200
Subject: [PATCH 04/55] dns: send IPv6 connectivity probes to RIPE DNS rather
than Google
Short of disabling the code (we may do that in a subsequent patch
anyway), avoid sending to Google.
---
net/dns/host_resolver_impl.cc | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/net/dns/host_resolver_impl.cc b/net/dns/host_resolver_impl.cc
index 1a6bd61..6317281 100644
--- a/net/dns/host_resolver_impl.cc
+++ b/net/dns/host_resolver_impl.cc
@@ -87,10 +87,10 @@ const unsigned kMinimumTTLSeconds = kCacheEntryTTLSeconds;
// 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
--
2.6.6

42
resources/common/patches/iridium-browser/extensions-always-show-component-extensions-in-the-e.patch
View File

@@ -1,42 +0,0 @@
From f110b50893ac9249dbecf22fcd0cbfdf6c23fd45 Mon Sep 17 00:00:00 2001
From: Joachim Bauch <jojo@struktur.de>
Date: Thu, 25 Jun 2015 15:34:10 +0200
Subject: [PATCH 50/55] extensions: always show component extensions in the ext
list
The attached patch makes sure that component extensions are always
shown in "chrome://extensions".
Currently these are
- Bookmark Manager
- Chromium PDF Viewer
- CryptoTokenExtension
References: https://github.com/iridium-browser/iridium-browser/issues/28
---
extensions/common/extension.cc | 2 ++
1 file changed, 2 insertions(+)
diff --git a/extensions/common/extension.cc b/extensions/common/extension.cc
index 227cb7e..4af32c2 100644
--- a/extensions/common/extension.cc
+++ b/extensions/common/extension.cc
@@ -353,6 +353,7 @@ bool Extension::ShouldDisplayInExtensionSettings() const {
}
bool Extension::ShouldNotBeVisible() const {
+#if 0
// Don't show component extensions because they are only extensions as an
// implementation detail of Chrome.
if (extensions::Manifest::IsComponentLocation(location()) &&
@@ -369,6 +370,7 @@ bool Extension::ShouldNotBeVisible() const {
if (is_app() && !ShouldDisplayInAppLauncher() && !ShouldDisplayInNewTabPage())
return true;
+#endif
return false;
}
--
2.6.6

41
resources/common/patches/iridium-browser/first_run-barf-if-metrics_reporting-is-activated.patch
View File

@@ -1,41 +0,0 @@
From e3b8ae77e773e0551214a996266b86539fec6ff9 Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Sat, 13 Sep 2014 16:40:17 +0200
Subject: [PATCH 21/55] first_run: barf if metrics_reporting is activated
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
This patch is for debugging purposes and is meant for discovering
whether — despite our patching efforts — metrics_reporting is still
enabled somehow, and if so, say so on stderr.
Result: As of October 2014, metrics_reporting seems successfully
disabled, as no message is emitted.
---
chrome/browser/first_run/first_run_internal_posix.cc | 2 ++
1 file changed, 2 insertions(+)
diff --git a/chrome/browser/first_run/first_run_internal_posix.cc b/chrome/browser/first_run/first_run_internal_posix.cc
index b69fdd2..f90e04e 100644
--- a/chrome/browser/first_run/first_run_internal_posix.cc
+++ b/chrome/browser/first_run/first_run_internal_posix.cc
@@ -19,6 +19,7 @@
#include "components/metrics/metrics_pref_names.h"
#include "components/prefs/pref_service.h"
#include "components/startup_metric_utils/browser/startup_metric_utils.h"
+#include <cstdio>
namespace first_run {
namespace internal {
@@ -42,6 +43,7 @@ void DoPostImportPlatformSpecificTasks(Profile* profile) {
// the pref (on Windows, the download is tagged with enable/disable stats so
// this is POSIX-specific).
if (GoogleUpdateSettings::GetCollectStatsConsent()) {
+ fprintf(stderr, "*** metrics_reporting = 1\n");
g_browser_process->local_state()->SetBoolean(
metrics::prefs::kMetricsReportingEnabled, true);
}
--
2.6.6

32
resources/common/patches/iridium-browser/first_run-deactivate-autoupdate-globally.patch
View File

@@ -1,32 +0,0 @@
From 6994bf5d32c42b293bad8ae843c7ce2d4a129115 Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Sat, 13 Sep 2014 17:12:43 +0200
Subject: [PATCH 26/55] first_run: deactivate autoupdate globally
We currently do not have any update service infrastructure in place
(i.e. on our webserver), and sending update requests to Google also
sounds meh (wrong provider, after all).
Also, there is no tunable in chrome://settings (or similar) yet to
turn it back on.
---
chrome/browser/extensions/extension_system_impl.cc | 3 +++
1 file changed, 3 insertions(+)
diff --git a/chrome/browser/extensions/extension_system_impl.cc b/chrome/browser/extensions/extension_system_impl.cc
index 1a04022..2754fe8 100644
--- a/chrome/browser/extensions/extension_system_impl.cc
+++ b/chrome/browser/extensions/extension_system_impl.cc
@@ -164,6 +164,9 @@ void ExtensionSystemImpl::Shared::Init(bool extensions_enabled) {
bool autoupdate_enabled = !profile_->IsGuestSession() &&
!profile_->IsSystemProfile();
+ if (autoupdate_enabled)
+ fprintf(stderr, "*** autoupdate was enabled, overriding with false\n");
+ autoupdate_enabled = false;
#if defined(OS_CHROMEOS)
if (!extensions_enabled)
autoupdate_enabled = false;
--
2.6.6

46
resources/common/patches/iridium-browser/google-cloud-messaging-disable-experiment-status-che.patch
View File

@@ -1,46 +0,0 @@
From bb7db96b2a3f43b6d77ff6a7a972e73bd2348a55 Mon Sep 17 00:00:00 2001
From: Joachim Bauch <jojo@struktur.de>
Date: Mon, 1 Jun 2015 17:14:34 +0200
Subject: [PATCH 37/55] google-cloud-messaging: disable experiment status check
This avoids trk:263 from triggering.
---
components/gcm_driver/gcm_channel_status_request.cc | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/components/gcm_driver/gcm_channel_status_request.cc b/components/gcm_driver/gcm_channel_status_request.cc
index bafaee3..3167562 100644
--- a/components/gcm_driver/gcm_channel_status_request.cc
+++ b/components/gcm_driver/gcm_channel_status_request.cc
@@ -21,8 +21,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.
@@ -55,6 +57,7 @@ int GCMChannelStatusRequest::min_poll_interval_seconds() {
}
void GCMChannelStatusRequest::Start() {
+#if 0
DCHECK(!url_fetcher_.get());
GURL request_url(channel_status_request_url_);
@@ -74,6 +77,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(
--
2.6.6

45
resources/common/patches/iridium-browser/google_now-disable-this.patch
View File

@@ -1,45 +0,0 @@
From b68dc342af6624e5363594b31246398c304c27d7 Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Fri, 19 Jun 2015 19:20:39 +0200
Subject: [PATCH 47/55] google_now: disable this
"Google Now is an intelligent personal assistant developed by Google.
It is available within the Google Search mobile application for
Android, as well as the Google Chrome web browser on personal
computers." (-WP)
Get off my lawn!
---
chrome/chrome_features.gyp | 2 +-
chrome/common/BUILD.gn | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/chrome/chrome_features.gyp b/chrome/chrome_features.gyp
index df799dd..7b38533 100644
--- a/chrome/chrome_features.gyp
+++ b/chrome/chrome_features.gyp
@@ -15,7 +15,7 @@
'buildflag_header_path': 'chrome/common/features.h',
'buildflag_flags': [
'ENABLE_BACKGROUND=<(enable_background)',
- 'ENABLE_GOOGLE_NOW=<(enable_google_now)',
+ 'ENABLE_GOOGLE_NOW=0',
'ENABLE_ONE_CLICK_SIGNIN=<(enable_one_click_signin)',
'ANDROID_JAVA_UI=<(android_java_ui)',
'USE_VULCANIZE=<(use_vulcanize)',
diff --git a/chrome/common/BUILD.gn b/chrome/common/BUILD.gn
index 3136801..d038b1c 100644
--- a/chrome/common/BUILD.gn
+++ b/chrome/common/BUILD.gn
@@ -43,7 +43,7 @@ buildflag_header("features") {
flags = [
"ANDROID_JAVA_UI=$android_java_ui",
"ENABLE_BACKGROUND=$enable_background",
- "ENABLE_GOOGLE_NOW=$enable_google_now",
+ "ENABLE_GOOGLE_NOW=0",
"ENABLE_ONE_CLICK_SIGNIN=$enable_one_click_signin",
"ENABLE_PACKAGE_MASH_SERVICES=$enable_package_mash_services",
"USE_VULCANIZE=$use_vulcanize",
--
2.6.6

26
resources/common/patches/iridium-browser/hotword-disable-at-build-time-by-default.patch
View File

@@ -37,32 +37,6 @@ index 0170206..acdb5e4 100644
}
additional_modules_list_file =
diff --git a/chrome/browser/extensions/component_loader.cc b/chrome/browser/extensions/component_loader.cc
index dfcfcb9..c6778a9 100644
--- a/chrome/browser/extensions/component_loader.cc
+++ b/chrome/browser/extensions/component_loader.cc
@@ -357,17 +357,21 @@ void ComponentLoader::AddHangoutServicesExtension() {
}
void ComponentLoader::AddHotwordAudioVerificationApp() {
+#if 0
if (HotwordServiceFactory::IsAlwaysOnAvailable()) {
Add(IDR_HOTWORD_AUDIO_VERIFICATION_MANIFEST,
base::FilePath(FILE_PATH_LITERAL("hotword_audio_verification")));
}
+#endif
}
void ComponentLoader::AddHotwordHelperExtension() {
+#if 0
if (HotwordServiceFactory::IsHotwordAllowed(profile_)) {
Add(IDR_HOTWORD_MANIFEST,
base::FilePath(FILE_PATH_LITERAL("hotword")));
}
+#endif
}
void ComponentLoader::AddImageLoaderExtension() {
diff --git a/chrome/browser/search/hotword_service_unittest.cc b/chrome/browser/search/hotword_service_unittest.cc
index e5887df..6517883 100644
--- a/chrome/browser/search/hotword_service_unittest.cc

40
resources/common/patches/iridium-browser/net-add-trk-scheme-and-help-identify-URLs-being-retr.patch
View File

@@ -202,10 +202,10 @@ diff --git a/components/infobars/core/infobar_delegate.h b/components/infobars/c
index 00b0175..a0e4779 100644
--- a/components/infobars/core/infobar_delegate.h
+++ b/components/infobars/core/infobar_delegate.h
@@ -131,6 +131,7 @@ class InfoBarDelegate {
CONFIRM_DANGEROUS_DOWNLOAD = 61,
DESKTOP_SEARCH_REDIRECTION_INFOBAR_DELEGATE = 62,
@@ -132,6 +132,7 @@ class InfoBarDelegate {
// Removed: DESKTOP_SEARCH_REDIRECTION_INFOBAR_DELEGATE = 62,
UPDATE_PASSWORD_INFOBAR_DELEGATE = 63,
DATA_REDUCTION_PROMO_INFOBAR_DELEGATE_ANDROID = 64,
+ TRACKING_ALERT_INFOBAR_DELEGATE = 9001,
};
@@ -282,7 +282,7 @@ diff --git a/content/browser/child_process_security_policy_impl.cc b/content/bro
index bd84239..790ff41 100644
--- a/content/browser/child_process_security_policy_impl.cc
+++ b/content/browser/child_process_security_policy_impl.cc
@@ -307,6 +307,7 @@ ChildProcessSecurityPolicyImpl::ChildProcessSecurityPolicyImpl() {
@@ -308,6 +308,7 @@ ChildProcessSecurityPolicyImpl::ChildProcessSecurityPolicyImpl() {
RegisterPseudoScheme(url::kAboutScheme);
RegisterPseudoScheme(url::kJavaScriptScheme);
RegisterPseudoScheme(kViewSourceScheme);
@@ -290,32 +290,6 @@ index bd84239..790ff41 100644
}
ChildProcessSecurityPolicyImpl::~ChildProcessSecurityPolicyImpl() {
@@ -395,7 +396,7 @@ void ChildProcessSecurityPolicyImpl::GrantRequestURL(
if (IsPseudoScheme(url.scheme())) {
// The view-source scheme is a special case of a pseudo-URL that eventually
// results in requesting its embedded URL.
- if (url.SchemeIs(kViewSourceScheme)) {
+ if (url.SchemeIs(kViewSourceScheme) || url.SchemeIs(url::kTraceScheme)) {
// URLs with the view-source scheme typically look like:
// view-source:http://www.google.com/a
// In order to request these URLs, the child_id needs to be able to
@@ -587,13 +588,15 @@ bool ChildProcessSecurityPolicyImpl::CanRequestURL(
if (IsPseudoScheme(url.scheme())) {
// There are a number of special cases for pseudo schemes.
- if (url.SchemeIs(kViewSourceScheme)) {
+ if (url.SchemeIs(kViewSourceScheme) || url.SchemeIs(url::kTraceScheme)) {
// A view-source URL is allowed if the child process is permitted to
// request the embedded URL. Careful to avoid pointless recursion.
GURL child_url(url.GetContent());
if (child_url.SchemeIs(kViewSourceScheme) &&
url.SchemeIs(kViewSourceScheme))
return false;
+ if (child_url.SchemeIs(url::kTraceScheme) && url.SchemeIs(url::kTraceScheme))
+ return false;
return CanRequestURL(child_id, child_url);
}
diff --git a/iridium/iridium.gyp b/iridium/iridium.gyp
new file mode 100644
index 0000000..a1fee8f
@@ -564,10 +538,10 @@ diff --git a/tools/metrics/histograms/histograms.xml b/tools/metrics/histograms/
index e76c2ef..4219c2e 100644
--- a/tools/metrics/histograms/histograms.xml
+++ b/tools/metrics/histograms/histograms.xml
@@ -73167,6 +73167,7 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
<int value="60" label="CHROME_WINDOW_ERROR"/>
<int value="61" label="CONFIRM_DANGEROUS_DOWNLOAD"/>
@@ -79476,6 +79476,7 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
<int value="62" label="WINDOWS_DESKTOP_SEARCH_INFOBAR_DELEGATE"/>
<int value="63" label="UPDATE_PASSWORD_INFOBAR_DELEGATE"/>
<int value="64" label="DATA_REDUCTION_PROMO_INFOBAR_DELEGATE_ANDROID"/>
+ <int value="9001" label="TRACKING_ALERT_INFOBAR_DELEGATE"/>
</enum>

28
resources/common/patches/iridium-browser/prefs-block-third-party-cookies-by-default.patch
View File

@@ -1,28 +0,0 @@
From e057c0ccb9b36c8b0cd6c2950b31e8d86e86ba3d Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Sat, 13 Sep 2014 16:43:55 +0200
Subject: [PATCH 14/55] prefs: block third-party cookies by default
Reject extra cookies which are likely used for tracking and whatnot.
There are very few websites which require this, and if you do visit
some, static exceptions can be defined.
---
components/content_settings/core/browser/cookie_settings.cc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/components/content_settings/core/browser/cookie_settings.cc b/components/content_settings/core/browser/cookie_settings.cc
index 475b642..874887d 100644
--- a/components/content_settings/core/browser/cookie_settings.cc
+++ b/components/content_settings/core/browser/cookie_settings.cc
@@ -82,7 +82,7 @@ void CookieSettings::GetCookieSettings(
void CookieSettings::RegisterProfilePrefs(
user_prefs::PrefRegistrySyncable* registry) {
registry->RegisterBooleanPref(
- prefs::kBlockThirdPartyCookies, false,
+ prefs::kBlockThirdPartyCookies, true,
user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
}
--
2.6.6

33
resources/common/patches/iridium-browser/prefs-disable-Use-a-prediction-service-to-help-compl.patch
View File

@@ -1,33 +0,0 @@
From 6e4bf69be364a94e03463050cb638f82f5c84325 Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Sat, 13 Sep 2014 15:06:39 +0200
Subject: [PATCH 11/55] prefs: disable "Use a prediction service to help
complete searches..."
This autocomplete service would send search queries as soon as you
started typing, even if not yet done typing. Some regard this as an
information leak, others as a waste of bytes sent over the network.
Either reason is fine for me to disable this by default.
Impl. details:
Set suggest_enabled to false 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 5f13d07..e8f7e4f 100644
--- a/chrome/browser/profiles/profile.cc
+++ b/chrome/browser/profiles/profile.cc
@@ -77,7 +77,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 BUILDFLAG(ANDROID_JAVA_UI)
registry->RegisterStringPref(
--
2.6.6

31
resources/common/patches/iridium-browser/prefs-disable-Use-a-web-service-to-help-resolve-navi.patch
View File

@@ -1,31 +0,0 @@
From b6db94ae9016f429eafc48a96d601b79f793dedd Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Thu, 11 Sep 2014 16:35:12 +0200
Subject: [PATCH 10/55] prefs: disable "Use a web service to help resolve
navigation errors"
This goes towards reducing promiscuous outbound requests to
some central services.
Impl. details:
Set alternate_error_pages to be disabled by default.
---
chrome/browser/ui/navigation_correction_tab_observer.cc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/chrome/browser/ui/navigation_correction_tab_observer.cc b/chrome/browser/ui/navigation_correction_tab_observer.cc
index ad27f82..f288dc5 100644
--- a/chrome/browser/ui/navigation_correction_tab_observer.cc
+++ b/chrome/browser/ui/navigation_correction_tab_observer.cc
@@ -56,7 +56,7 @@ NavigationCorrectionTabObserver::~NavigationCorrectionTabObserver() {
void NavigationCorrectionTabObserver::RegisterProfilePrefs(
user_prefs::PrefRegistrySyncable* prefs) {
prefs->RegisterBooleanPref(prefs::kAlternateErrorPagesEnabled,
- true,
+ false,
user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
}
--
2.6.6

27
resources/common/patches/iridium-browser/prefs-disable-background-mode-by-default.patch
View File

@@ -1,27 +0,0 @@
From c63b8c9dc1e26ee3cfb59eb8ba3f48d1e7c4a72c Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Sat, 13 Sep 2014 16:59:10 +0200
Subject: [PATCH 16/55] prefs: disable background mode by default
If I tell the browser to quit, I mean it. Relinquish the memory,
do not linger around, do not possibly collect data somewhere.
---
chrome/browser/background/background_mode_manager.cc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/chrome/browser/background/background_mode_manager.cc b/chrome/browser/background/background_mode_manager.cc
index fcd2c67..bd7c1cc 100644
--- a/chrome/browser/background/background_mode_manager.cc
+++ b/chrome/browser/background/background_mode_manager.cc
@@ -355,7 +355,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) {
--
2.6.6

32
resources/common/patches/iridium-browser/prefs-disable-hyperlink-auditing.patch
View File

@@ -1,32 +0,0 @@
From 001c5ea7f573930c2988cf6be72fe2c99c0ecc1e Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Sat, 13 Sep 2014 17:03:17 +0200
Subject: [PATCH 17/55] prefs: disable hyperlink auditing
"Disable sending hyperlink auditing pings", i.e. pings to
URLs in <a ping="..."> when clicked.
The feature is already switchable through chrome://flags, so no
new UI elements need to be added.
https://html.spec.whatwg.org/multipage/semantics.html#hyperlink-auditing .
---
chrome/browser/chrome_content_browser_client.cc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
index 5ae5889..7754186 100644
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -746,7 +746,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);
}
--
2.6.6

40
resources/common/patches/iridium-browser/prefs-disable-network-DNS-prediction.patch
View File

@@ -1,40 +0,0 @@
From 7c9a6bcdffbd0573211cf12ea9770e9999d5d52e Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Sat, 13 Sep 2014 15:20:11 +0200
Subject: [PATCH 13/55] prefs: disable network/DNS prediction
Stop wasting my bandwidth (however little), and also don't tell others
what I am about to visit.
---
chrome/browser/net/prediction_options.cc | 1 -
chrome/browser/net/prediction_options.h | 2 +-
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/chrome/browser/net/prediction_options.cc b/chrome/browser/net/prediction_options.cc
index 8ab8a07..cadef71 100644
--- a/chrome/browser/net/prediction_options.cc
+++ b/chrome/browser/net/prediction_options.cc
@@ -30,7 +30,6 @@ NetworkPredictionStatus CanPrefetchAndPrerender(
return NetworkPredictionStatus::ENABLED;
}
default:
- 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 {
--
2.6.6

30
resources/common/patches/iridium-browser/prefs-disable-translation-service.patch
View File

@@ -1,30 +0,0 @@
From f9d83926016fd8c3c06185c0e37fd6b9f5773d77 Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Thu, 30 Oct 2014 22:04:24 +0100
Subject: [PATCH 24/55] prefs: disable translation service
When translation is enabled, the translation manager will request a
list of supported languages from translate.googleapis.com.
As it is Google, we do not want that, at least not without more
explicit user action. One should visit http://translate.google.com/
instead to request translations via Google.
---
chrome/browser/ui/browser_ui_prefs.cc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/chrome/browser/ui/browser_ui_prefs.cc b/chrome/browser/ui/browser_ui_prefs.cc
index 463c56c..79e2e2a 100644
--- a/chrome/browser/ui/browser_ui_prefs.cc
+++ b/chrome/browser/ui/browser_ui_prefs.cc
@@ -85,7 +85,7 @@ 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);
--
2.6.6

14
resources/common/patches/iridium-browser/prefs-do-not-store-passwords-by-default.patch
View File

@@ -11,13 +11,13 @@ diff --git a/components/password_manager/core/browser/password_manager.cc b/comp
index f4a5750..b0ec8d8 100644
--- a/components/password_manager/core/browser/password_manager.cc
+++ b/components/password_manager/core/browser/password_manager.cc
@@ -137,7 +137,7 @@ void PasswordManager::RegisterProfilePrefs(
user_prefs::PrefRegistrySyncable* registry) {
registry->RegisterBooleanPref(
prefs::kPasswordManagerSavingEnabled,
- true,
+ false,
user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
@@ -142,7 +142,7 @@ void PasswordManager::RegisterProfilePrefs(
#else
uint32_t flags = user_prefs::PrefRegistrySyncable::SYNCABLE_PREF;
#endif
- registry->RegisterBooleanPref(prefs::kPasswordManagerSavingEnabled, true,
+ registry->RegisterBooleanPref(prefs::kPasswordManagerSavingEnabled, false,
flags);
registry->RegisterBooleanPref(
prefs::kCredentialsEnableService, true,
--

32
resources/common/patches/iridium-browser/profile-resetter-do-not-tick-send-settings-by-defaul.patch
View File

@@ -1,32 +0,0 @@
From e60958579613c0feeacf569e879fe68fd5036cd8 Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Tue, 28 Oct 2014 18:45:19 +0100
Subject: [PATCH 06/55] profile-resetter: do not tick send-settings by default
When the user wishes to reset his preferences, Chromium would suggest
to send over the old settings to Google. I presume that this is for
Google to investigate into the setting combinations that led the user
to issue a rest.
Of course, we cannot let that happen by default. Google is not to get
any information.
---
chrome/browser/resources/options/reset_profile_settings_overlay.html | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/chrome/browser/resources/options/reset_profile_settings_overlay.html b/chrome/browser/resources/options/reset_profile_settings_overlay.html
index 504661f..02bb00c 100644
--- a/chrome/browser/resources/options/reset_profile_settings_overlay.html
+++ b/chrome/browser/resources/options/reset_profile_settings_overlay.html
@@ -26,7 +26,7 @@
<div id="feedback-bar"
class="gray-bottom-bar checkbox controlled-setting-with-label">
<label>
- <input id="send-settings" type="checkbox" checked>
+ <input id="send-settings" type="checkbox">
<span>
<span i18n-content="resetProfileSettingsFeedback"></span>
<span id="expand-feedback"></span>
--
2.6.6

24
resources/common/patches/iridium-browser/promo-disable-Google-promotion-fetching.patch
View File

@@ -33,30 +33,6 @@ index 80315d4..fb1d9ca 100644
// Don't show if the profile is an incognito.
if (profile->IsOffTheRecord())
@@ -352,8 +353,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/components/web_resource/notification_promo.cc b/components/web_resource/notification_promo.cc
index e37c844..7527f18 100644
--- a/components/web_resource/notification_promo.cc
+++ b/components/web_resource/notification_promo.cc
@@ -34,7 +34,7 @@ namespace {
const int kDefaultGroupSize = 100;
-const char promo_server_url[] = "https://clients3.google.com/crsignal/client";
+const char promo_server_url[] = "trk:122:about:blank";
// The name of the preference that stores the promotion object.
const char kPrefPromoObject[] = "promo";
--
2.6.6

10
resources/common/patches/iridium-browser/safe_browsing-disable-incident-reporting.patch
View File

@@ -93,19 +93,15 @@ diff --git a/chrome/browser/safe_browsing/safe_browsing_service.cc b/chrome/brow
index 5a9da1e..3245fb5 100644
--- a/chrome/browser/safe_browsing/safe_browsing_service.cc
+++ b/chrome/browser/safe_browsing/safe_browsing_service.cc
@@ -448,10 +448,12 @@ SafeBrowsingService::CreateIncidentReportingService() {
@@ -448,7 +448,7 @@ SafeBrowsingDatabaseManager* SafeBrowsingService::CreateDatabaseManager() {
}
void SafeBrowsingService::RegisterAllDelayedAnalysis() {
#if defined(FULL_SAFE_BROWSING)
-#if defined(FULL_SAFE_BROWSING)
+#if 0
RegisterBinaryIntegrityAnalysis();
RegisterBlacklistLoadAnalysis();
RegisterModuleLoadAnalysis(database_manager_);
RegisterVariationsSeedSignatureAnalysis();
+#endif
#else
NOTREACHED();
#endif
--
2.6.6

53
resources/common/patches/iridium-browser/search-show-blank-tab-for-new-tab-page.patch
View File

@@ -1,53 +0,0 @@
From 62b8fc8f03f0acc534fd43ed7f839e26d01846ab Mon Sep 17 00:00:00 2001
From: Joachim Bauch <jojo@struktur.de>
Date: Mon, 6 Jul 2015 17:17:20 +0200
Subject: [PATCH 48/55] search: show blank tab for new tab page
Avoid loading the search page everytime, just show a blank one instead.
References: https://github.com/iridium-browser/iridium-browser/issues/32
---
chrome/browser/search/search.cc | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/chrome/browser/search/search.cc b/chrome/browser/search/search.cc
index 645fecb..abe25d1f 100644
--- a/chrome/browser/search/search.cc
+++ b/chrome/browser/search/search.cc
@@ -225,6 +225,7 @@ bool IsURLAllowedForSupervisedUser(const GURL& url, Profile* profile) {
return true;
}
+#if 0
// Returns whether |new_tab_url| can be used as a URL for the New Tab page.
// NEW_TAB_URL_VALID means a valid URL; other enum values imply an invalid URL.
NewTabURLState IsValidNewTabURL(Profile* profile, const GURL& new_tab_url) {
@@ -238,6 +239,7 @@ NewTabURLState IsValidNewTabURL(Profile* profile, const GURL& new_tab_url) {
return NEW_TAB_URL_BLOCKED;
return NEW_TAB_URL_VALID;
}
+#endif
// Used to look up the URL to use for the New Tab page. Also tracks how we
// arrived at that URL so it can be logged with UMA.
@@ -246,6 +248,9 @@ struct NewTabURLDetails {
: url(url), state(state) {}
static NewTabURLDetails ForProfile(Profile* profile) {
+#if 1
+ return NewTabURLDetails(GURL("about:blank"), NEW_TAB_URL_VALID);
+#else
const GURL local_url(chrome::kChromeSearchLocalNtpUrl);
base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
@@ -271,6 +276,7 @@ struct NewTabURLDetails {
// Use the local New Tab otherwise.
return NewTabURLDetails(local_url, state);
}
+#endif
}
GURL url;
--
2.6.6

25
resources/common/patches/iridium-browser/spellchecker-flag-downloading-dictionary-from-Google.patch
View File

@@ -1,25 +0,0 @@
From d4a9eed5caf7a13bbc15bd23316e3e77df83c9bf Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Fri, 29 May 2015 15:55:42 +0200
Subject: [PATCH 36/55] spellchecker: flag downloading dictionary from Google
---
chrome/browser/resources/options/language_options.js | 2 ++
1 file changed, 2 insertions(+)
diff --git a/chrome/browser/resources/options/language_options.js b/chrome/browser/resources/options/language_options.js
index 4117c5c..a447ada 100644
--- a/chrome/browser/resources/options/language_options.js
+++ b/chrome/browser/resources/options/language_options.js
@@ -1001,6 +1001,8 @@ cr.define('options', function() {
* @private
*/
handleSpellCheckLanguageCheckboxClick_: function(e) {
+ if (!confirm("[trk:173] This operation will contact a Google server. Still proceed?"))
+ return;
var languageCode = e.currentTarget.languageCode;
if (e.currentTarget.checked)
--
2.6.6

47
resources/common/patches/iridium-browser/translate-disable-fetching-of-translate-languages-fr.patch
View File

@@ -1,47 +0,0 @@
From 9e936fb2f6309ae006b2ea6984afaa9e0e9e4624 Mon Sep 17 00:00:00 2001
From: Simon Eisenmann <simon@struktur.de>
Date: Mon, 26 Oct 2015 14:18:05 +0100
Subject: [PATCH 52/55] translate: disable fetching of translate languages from
server
GH issue #18.
---
components/translate/core/browser/translate_language_list.cc | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/components/translate/core/browser/translate_language_list.cc b/components/translate/core/browser/translate_language_list.cc
index e54d829..a0fabf2 100644
--- a/components/translate/core/browser/translate_language_list.cc
+++ b/components/translate/core/browser/translate_language_list.cc
@@ -142,10 +142,12 @@ const char* const kDefaultSupportedLanguages[] = {
// Constant URL string to fetch server supporting language list.
const char kLanguageListFetchPath[] = "translate_a/l?client=chrome";
+#if 0
// Used in kTranslateScriptURL to request supporting languages list including
// "alpha languages".
const char kAlphaLanguageQueryName[] = "alpha";
const char kAlphaLanguageQueryValue[] = "1";
+#endif
// Represent if the language list updater is disabled.
bool update_is_disabled = false;
@@ -216,6 +218,7 @@ GURL TranslateLanguageList::TranslateLanguageUrl() {
}
void TranslateLanguageList::RequestLanguageList() {
+#if 0
// If resource requests are not allowed, we'll get a callback when they are.
if (!resource_requests_allowed_) {
request_pending_ = true;
@@ -245,6 +248,7 @@ void TranslateLanguageList::RequestLanguageList() {
if (!result)
NotifyEvent(__LINE__, "Request is omitted due to retry limit");
}
+#endif
}
void TranslateLanguageList::SetResourceRequestsAllowed(bool allowed) {
--
2.6.6

67
resources/common/patches/iridium-browser/updater-disable-updater-pings.patch
View File

@@ -1,67 +0,0 @@
From d3147eb726e35cc032e38c707c9afefedb730f67 Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Tue, 2 Jun 2015 11:01:50 +0200
Subject: [PATCH 39/55] updater: disable updater pings
Despite auto-updater being arguably disabled (see previous commit),
Chromium would still send background requests. Kill it.
(trk:170, trk:171)
---
components/component_updater/component_updater_url_constants.cc | 2 +-
components/component_updater/configurator_impl.cc | 7 ++++++-
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/components/component_updater/component_updater_url_constants.cc b/components/component_updater/component_updater_url_constants.cc
index c762cc9..a5ac3c4 100644
--- a/components/component_updater/component_updater_url_constants.cc
+++ b/components/component_updater/component_updater_url_constants.cc
@@ -14,7 +14,7 @@ namespace component_updater {
//
// The value of |kDefaultUrlSource| can be overridden with
// --component-updater=url-source=someurl.
-const char kUpdaterDefaultUrl[] = "https://clients2.google.com/service/update2";
+const char kUpdaterDefaultUrl[] = "trk:171:https://clients2.google.com/service/update2";
const char kUpdaterFallbackUrl[] = "http://clients2.google.com/service/update2";
diff --git a/components/component_updater/configurator_impl.cc b/components/component_updater/configurator_impl.cc
index 8da26fd..a375515 100644
--- a/components/component_updater/configurator_impl.cc
+++ b/components/component_updater/configurator_impl.cc
@@ -38,7 +38,9 @@ const char kSwitchRequestParam[] = "test-request";
// Disables pings. Pings are the requests sent to the update server that report
// the success or the failure of component install or update attempts.
+#if 0
extern const char kSwitchDisablePings[] = "disable-pings";
+#endif
// Sets the URL for updates.
const char kSwitchUrlSource[] = "url-source";
@@ -95,7 +97,9 @@ ConfiguratorImpl::ConfiguratorImpl(
cmdline->GetSwitchValueASCII(switches::kComponentUpdater), ",",
base::KEEP_WHITESPACE, base::SPLIT_WANT_NONEMPTY);
fast_update_ = HasSwitchValue(switch_values, kSwitchFastUpdate);
+#if 0
pings_enabled_ = !HasSwitchValue(switch_values, kSwitchDisablePings);
+#endif
deltas_enabled_ = !HasSwitchValue(switch_values, kSwitchDisableDeltaUpdates);
#if defined(OS_WIN)
@@ -145,11 +149,12 @@ std::vector<GURL> ConfiguratorImpl::UpdateUrl() const {
return urls;
}
+#if 0
urls.push_back(GURL(kUpdaterDefaultUrl));
urls.push_back(GURL(kUpdaterFallbackUrl));
if (require_encryption_)
update_client::RemoveUnsecureUrls(&urls);
-
+#endif
return urls;
}
--
2.6.6

120
resources/common/patches/iridium-browser/webrtc-generate-real-ephemeral-keys.patch
View File

@@ -1,120 +0,0 @@
From a8ad49a0b618c4945995f1693988cec966c19c6e Mon Sep 17 00:00:00 2001
From: Joachim Bauch <jojo@struktur.de>
Date: Mon, 10 Nov 2014 16:19:32 +0100
Subject: [PATCH 03/55] webrtc: generate "real" ephemeral keys
By default, the browser caches generated keypairs for ECDHE key
exchange for the lifetime of the application. This means the same
keypair would be used for all WebRTC peer connections.
We obviously do not want that.
---
net/third_party/nss/ssl/ssl3ecc.c | 42 +++++++++++----------------------------
1 file changed, 12 insertions(+), 30 deletions(-)
diff --git a/net/third_party/nss/ssl/ssl3ecc.c b/net/third_party/nss/ssl/ssl3ecc.c
index c8e9d06..85c3e3b 100644
--- a/net/third_party/nss/ssl/ssl3ecc.c
+++ b/net/third_party/nss/ssl/ssl3ecc.c
@@ -149,6 +149,7 @@ static const Bits2Curve bits2curve[] = {
{ 65535, ec_noName }
};
+#if 0
typedef struct ECDHEKeyPairStr {
ssl3KeyPair *pair;
int error; /* error code of the call-once function */
@@ -157,6 +158,7 @@ typedef struct ECDHEKeyPairStr {
/* arrays of ECDHE KeyPairs */
static ECDHEKeyPair gECDHEKeyPairs[ec_pastLastName];
+#endif
SECStatus
ssl3_ECName2Params(PLArenaPool *arena, ECName curve, SECKEYECParams *params)
@@ -626,6 +628,7 @@ ssl3_GetCurveNameForServerSocket(sslSocket *ss)
requiredECCbits);
}
+#if 0
/* function to clear out the lists */
static SECStatus
ssl3_ShutdownECDHECurves(void *appData, void *nssData)
@@ -652,6 +655,7 @@ ssl3_ECRegister(void)
}
return (PRStatus)rv;
}
+#endif
/* Create an ECDHE key pair for a given curve */
SECStatus
@@ -660,10 +664,12 @@ ssl3_CreateECDHEphemeralKeyPair(ECName ec_curve, ssl3KeyPair **keyPair)
SECKEYPrivateKey *privKey = NULL;
SECKEYPublicKey *pubKey = NULL;
SECKEYECParams ecParams = { siBuffer, NULL, 0 };
+ SECStatus status;
- if (ssl3_ECName2Params(NULL, ec_curve, &ecParams) != SECSuccess) {
- return SECFailure;
- }
+ fprintf(stderr, "*** Using patched ssl3_CreateECDHEphemeralKeys\n");
+ status = ssl3_ECName2Params(NULL, ec_curve, &ecParams);
+ if (status != SECSuccess)
+ return status;
privKey = SECKEY_CreateECPrivateKey(&ecParams, &pubKey, NULL);
SECITEM_FreeItem(&ecParams, PR_FALSE);
@@ -681,6 +687,7 @@ ssl3_CreateECDHEphemeralKeyPair(ECName ec_curve, ssl3KeyPair **keyPair)
return SECSuccess;
}
+#if 0
/* CallOnce function, called once for each named curve. */
static PRStatus
ssl3_CreateECDHEphemeralKeyPairOnce(void *arg)
@@ -699,6 +706,7 @@ ssl3_CreateECDHEphemeralKeyPairOnce(void *arg)
gECDHEKeyPairs[ec_curve].pair = keyPair;
return PR_SUCCESS;
}
+#endif
/*
* Creates the ephemeral public and private ECDH keys used by
@@ -712,33 +720,7 @@ ssl3_CreateECDHEphemeralKeyPairOnce(void *arg)
static SECStatus
ssl3_CreateECDHEphemeralKeys(sslSocket *ss, ECName ec_curve)
{
- ssl3KeyPair *keyPair = NULL;
-
- /* if there's no global key for this curve, make one. */
- if (gECDHEKeyPairs[ec_curve].pair == NULL) {
- PRStatus status;
-
- status = PR_CallOnce(&gECDHEKeyPairs[ec_noName].once, ssl3_ECRegister);
- if (status != PR_SUCCESS) {
- PORT_SetError(gECDHEKeyPairs[ec_noName].error);
- return SECFailure;
- }
- status = PR_CallOnceWithArg(&gECDHEKeyPairs[ec_curve].once,
- ssl3_CreateECDHEphemeralKeyPairOnce,
- (void *)ec_curve);
- if (status != PR_SUCCESS) {
- PORT_SetError(gECDHEKeyPairs[ec_curve].error);
- return SECFailure;
- }
- }
-
- keyPair = gECDHEKeyPairs[ec_curve].pair;
- PORT_Assert(keyPair != NULL);
- if (!keyPair)
- return SECFailure;
- ss->ephemeralECDHKeyPair = ssl3_GetKeyPairRef(keyPair);
-
- return SECSuccess;
+ return ssl3_CreateECDHEphemeralKeyPair(ec_curve, &ss->ephemeralECDHKeyPair);
}
SECStatus
--
2.6.6

43
resources/common/patches/patch_order
View File

@@ -7,42 +7,33 @@ debian/disable/default-browser-warning.patch
debian/ps-print.patch
debian/gpu-timeout.patch
inox-patchset/chromium-widevine.patch
inox-patchset/disable-autofill-download-manager.patch
inox-patchset/disable-default-extensions.patch
inox-patchset/disable-first-run-behaviour.patch
inox-patchset/disable-google-url-tracker.patch
inox-patchset/disable-new-avatar-menu.patch
inox-patchset/disable-translation-lang-fetch.patch
inox-patchset/disable-default-extensions.patch
inox-patchset/modify-default-prefs.patch
inox-patchset/disable-web-resource-service.patch
inox-patchset/restore-classic-ntp.patch
inox-patchset/disable-google-ipv6-probes.patch
inox-patchset/disable-gcm-status-check.patch
inox-patchset/add-duckduckgo-search-engine.patch
inox-patchset/disable-missing-key-warning.patch
inox-patchset/disable-translation-lang-fetch.patch
inox-patchset/disable-update-pings.patch
inox-patchset/chromium-sandbox-pie.patch
inox-patchset/disable-new-avatar-menu.patch
inox-patchset/disable-first-run-behaviour.patch
inox-patchset/disable-battery-status-service.patch
iridium-browser/net-cert-increase-default-key-length-for-newly-gener.patch
iridium-browser/webrtc-disable-WebRTC-identity-store.patch
iridium-browser/webrtc-generate-real-ephemeral-keys.patch
iridium-browser/dns-send-IPv6-connectivity-probes-to-RIPE-DNS-rather.patch
iridium-browser/profile-resetter-do-not-tick-send-settings-by-defaul.patch
iridium-browser/browser-ui-disable-warning-about-missing-API-keys.patch
iridium-browser/mime_util-force-text-x-suse-ymp-to-be-downloaded.patch
iridium-browser/autofill-disable-autofill-download-manager.patch
iridium-browser/prefs-disable-Use-a-web-service-to-help-resolve-navi.patch
iridium-browser/prefs-disable-Use-a-prediction-service-to-help-compl.patch
iridium-browser/prefs-disable-network-DNS-prediction.patch
iridium-browser/prefs-block-third-party-cookies-by-default.patch
iridium-browser/cloud-print-disable-in-prefs-and-component-loader.patch
iridium-browser/prefs-disable-background-mode-by-default.patch
iridium-browser/prefs-disable-hyperlink-auditing.patch
iridium-browser/prefs-do-not-store-passwords-by-default.patch
iridium-browser/prefs-only-keep-cookies-until-exit.patch
iridium-browser/prefs-always-prompt-for-download-directory-by-defaul.patch
iridium-browser/first_run-barf-if-metrics_reporting-is-activated.patch
iridium-browser/prefs-disable-translation-service.patch
iridium-browser/first_run-deactivate-autoupdate-globally.patch
iridium-browser/build-build-the-sandbox-with-PIE.patch
iridium-browser/updater-disable-auto-update.patch
iridium-browser/Remove-EV-certificates.patch
iridium-browser/spellchecker-flag-downloading-dictionary-from-Google.patch
iridium-browser/google-cloud-messaging-disable-experiment-status-che.patch
iridium-browser/net-add-trk-scheme-and-help-identify-URLs-being-retr.patch
iridium-browser/updater-disable-updater-pings.patch
iridium-browser/safe_browsing-disable-incident-reporting.patch
iridium-browser/safe_browsing-disable-reporting-of-safebrowsing-over.patch
iridium-browser/safe_browsing-support-trk-prefix.patch
@@ -50,14 +41,8 @@ iridium-browser/safe_browsing-disable-cookie-transmission.patch
iridium-browser/all-add-trk-prefixes-to-possibly-evil-connections.patch
iridium-browser/promo-disable-Google-promotion-fetching.patch
iridium-browser/hotword-disable-at-build-time-by-default.patch
iridium-browser/google_now-disable-this.patch
iridium-browser/search-show-blank-tab-for-new-tab-page.patch
iridium-browser/browser-disable-profile-auto-import-on-first-run.patch
iridium-browser/extensions-always-show-component-extensions-in-the-e.patch
iridium-browser/battery_status_service-disable-more-privacy-nightmar.patch
iridium-browser/translate-disable-fetching-of-translate-languages-fr.patch
ungoogled-chromium/disable-web-resource-service.patch
ungoogled-chromium/clear-http-auth-cache-menu-item.patch
ungoogled-chromium/disable-crash-reporter.patch
ungoogled-chromium/disable-formatting-in-omnibox.patch