diff --git a/README.md b/README.md index 291bb13b..958097de 100644 --- a/README.md +++ b/README.md @@ -22,7 +22,7 @@ In addition to features provided by [Iridium Browser](https://iridiumbrowser.de/ All features come in the form of patches. Patches are stored in the `patches` directory, with the exception of platform-specific patches (which are in the `build_templates` directory). -Currently, the patches are applied on top of Chromium 48.0.2564.116. See the Building section below for information on using these patches. +The latest set of patches are available on [the tags page](https://github.com/Eloston/ungoogled-chromium/tags). See the Building section below for information on using these patches. Here's an overview of the files in the `patches` directory: * `ungoogled-chromium/` @@ -42,7 +42,7 @@ Here's an overview of the files in the `patches` directory: ## Releases -[Builds with these patches are available here](https://github.com/Eloston/ungoogled-chromium/releases). +Builds with these patches are available on [the releases page](https://github.com/Eloston/ungoogled-chromium/releases). ## Building diff --git a/patches/iridium-browser/Remove-EV-certificates.patch b/patches/iridium-browser/Remove-EV-certificates.patch index 42d0ce42..02929df7 100644 --- a/patches/iridium-browser/Remove-EV-certificates.patch +++ b/patches/iridium-browser/Remove-EV-certificates.patch @@ -1,7 +1,7 @@ -From 2b5edabe0f83c4bd85e86510e5ea63ba535eda1e Mon Sep 17 00:00:00 2001 +From 8782b299ed2c7f0ac4c32d966f05dac479afcd17 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Mon, 2 Mar 2015 11:28:26 +0100 -Subject: [PATCH 37/56] Remove EV certificates +Subject: [PATCH 36/57] Remove EV certificates The team chose to let EV certificates appear just like normal certificates. The web of trust is considered a failure in itself, so @@ -12,7 +12,7 @@ Instead, let them appear just like regular ones. 1 file changed, 12 insertions(+) diff --git a/net/cert/ev_root_ca_metadata.cc b/net/cert/ev_root_ca_metadata.cc -index 8dd55f4..5813a6d 100644 +index a5ac6e2..ec33175 100644 --- a/net/cert/ev_root_ca_metadata.cc +++ b/net/cert/ev_root_ca_metadata.cc @@ -41,6 +41,17 @@ struct EVMetadata { @@ -33,7 +33,7 @@ index 8dd55f4..5813a6d 100644 // AC Camerfirma S.A. Chambers of Commerce Root - 2008 // https://www.camerfirma.com { { { 0x78, 0x6a, 0x74, 0xac, 0x76, 0xab, 0x14, 0x7f, 0x9c, 0x6a, -@@ -496,6 +507,7 @@ static const EVMetadata ev_root_ca_metadata[] = { +@@ -491,6 +502,7 @@ static const EVMetadata ev_root_ca_metadata[] = { 0xcf, 0x30, 0x54, 0xf3, 0x4c, 0x52, 0xb7, 0xe5, 0x58, 0xc6 } }, {"2.16.840.1.114404.1.1.2.4.1", ""}, } @@ -42,5 +42,5 @@ index 8dd55f4..5813a6d 100644 #endif // defined(USE_NSS_CERTS) || defined(OS_IOS) || defined(OS_WIN) -- -2.4.3 +2.6.2 diff --git a/patches/iridium-browser/all-add-trk-prefixes-to-possibly-evil-connections.patch b/patches/iridium-browser/all-add-trk-prefixes-to-possibly-evil-connections.patch index 16f2ad61..bf5287f3 100644 --- a/patches/iridium-browser/all-add-trk-prefixes-to-possibly-evil-connections.patch +++ b/patches/iridium-browser/all-add-trk-prefixes-to-possibly-evil-connections.patch @@ -1,7 +1,7 @@ -From 6b43f8be2683861236c864df55a15c21a8117b9e Mon Sep 17 00:00:00 2001 +From a92a5074fa64e3e4553ede60eb1c96ffe85c68a6 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Mon, 3 Nov 2014 10:52:56 +0100 -Subject: [PATCH 47/56] all: add trk: prefixes to possibly evil connections +Subject: [PATCH 46/57] all: add trk: prefixes to possibly evil connections Prefix URLs to Google services with trk: so that whenever something tries to load them, the developer will be informed via printf and @@ -25,7 +25,6 @@ by default. chrome/browser/media/media_url_constants.cc | 2 +- chrome/browser/nacl_host/nacl_infobar_delegate.cc | 2 +- chrome/browser/net/predictor.cc | 2 +- - chrome/browser/plugins/plugin_infobar_delegates.cc | 4 ++-- chrome/browser/profiles/profile_avatar_downloader.cc | 2 +- .../chromeos/chromevox/chromevox/background/prefs.js | 4 ++-- .../resources/default_apps/external_extensions.json | 6 +++--- @@ -37,7 +36,6 @@ by default. .../experimental/supervised_user_async_url_checker.cc | 2 +- .../browser/supervised_user/supervised_user_service.cc | 2 +- .../ui/app_list/search/people/people_provider.cc | 4 ++-- - .../ui/startup/obsolete_system_infobar_delegate.cc | 2 +- .../browser/ui/views/outdated_upgrade_bubble_view.cc | 2 +- .../website_settings/mock_permission_bubble_request.cc | 6 +++--- chrome/browser/ui/webui/ntp/ntp_resource_cache.cc | 8 ++++---- @@ -53,7 +51,7 @@ by default. cloud_print/gcp20/prototype/cloud_print_requester.cc | 2 +- cloud_print/service/service_state.cc | 2 +- cloud_print/virtual_driver/win/install/setup.cc | 2 +- - components/cloud_devices/common/cloud_devices_urls.cc | 12 ++++++------ + components/cloud_devices/common/cloud_devices_urls.cc | 8 ++++---- components/copresence/rpc/rpc_handler.cc | 2 +- components/crash/content/app/breakpad_linux.cc | 2 +- components/crash/content/tools/crash_service.cc | 2 +- @@ -84,16 +82,18 @@ by default. jingle/notifier/base/gaia_token_pre_xmpp_auth.cc | 2 +- net/cert/ct_known_logs_static.h | 12 ++++++------ remoting/base/breakpad_mac.mm | 2 +- + remoting/base/service_urls.cc | 4 ++-- remoting/protocol/jingle_messages.cc | 2 +- remoting/webapp/base/js/xmpp_login_handler.js | 2 +- + remoting/webapp/crd/manifest.json.jinja2 | 2 +- rlz/lib/lib_values.cc | 2 +- sync/tools/sync_client.cc | 2 +- ui/app_list/demo/app_list_demo_views.cc | 2 +- ui/views/examples/webview_example.cc | 2 +- - 79 files changed, 131 insertions(+), 130 deletions(-) + 79 files changed, 129 insertions(+), 128 deletions(-) diff --git a/build/mac/tweak_info_plist.py b/build/mac/tweak_info_plist.py -index 2057bac..72d1604 100755 +index a6ffbca..90b9cbc 100755 --- a/build/mac/tweak_info_plist.py +++ b/build/mac/tweak_info_plist.py @@ -179,7 +179,7 @@ def _AddKeystoneKeys(plist, bundle_identifier): @@ -115,10 +115,10 @@ index 2057bac..72d1604 100755 # This allows crash dumping to a file without uploading the # dump, for testing purposes. Breakpad does not recognise diff --git a/chrome/browser/chromeos/customization/customization_document.cc b/chrome/browser/chromeos/customization/customization_document.cc -index bf7028b..e26be36 100644 +index b326170..031adba 100644 --- a/chrome/browser/chromeos/customization/customization_document.cc +++ b/chrome/browser/chromeos/customization/customization_document.cc -@@ -153,7 +153,7 @@ void CheckWallpaperCacheExists(const base::FilePath& path, bool* exists) { +@@ -155,7 +155,7 @@ void CheckWallpaperCacheExists(const base::FilePath& path, bool* exists) { // Template URL where to fetch OEM services customization manifest from. const char ServicesCustomizationDocument::kManifestUrl[] = @@ -128,10 +128,10 @@ index bf7028b..e26be36 100644 // A custom extensions::ExternalLoader that the ServicesCustomizationDocument // creates and uses to publish OEM default apps to the extensions system. diff --git a/chrome/browser/chromeos/extensions/file_manager/private_api_drive.cc b/chrome/browser/chromeos/extensions/file_manager/private_api_drive.cc -index caec650..8bacb20 100644 +index feacc46..b4253c5 100644 --- a/chrome/browser/chromeos/extensions/file_manager/private_api_drive.cc +++ b/chrome/browser/chromeos/extensions/file_manager/private_api_drive.cc -@@ -1077,7 +1077,7 @@ void FileManagerPrivateInternalGetDownloadUrlFunction::OnGetResourceEntry( +@@ -1113,7 +1113,7 @@ void FileManagerPrivateInternalGetDownloadUrlFunction::OnGetResourceEntry( SigninManagerFactory::GetForProfile(GetProfile()); const std::string& account_id = signin_manager->GetAuthenticatedAccountId(); std::vector scopes; @@ -141,10 +141,10 @@ index caec650..8bacb20 100644 auth_service_.reset( new google_apis::AuthService(oauth2_token_service, diff --git a/chrome/browser/chromeos/extensions/file_manager/private_api_misc.cc b/chrome/browser/chromeos/extensions/file_manager/private_api_misc.cc -index 23d2ab6..b786e2a 100644 +index 2bf13ab..ee8a4f8 100644 --- a/chrome/browser/chromeos/extensions/file_manager/private_api_misc.cc +++ b/chrome/browser/chromeos/extensions/file_manager/private_api_misc.cc -@@ -56,7 +56,7 @@ +@@ -58,7 +58,7 @@ namespace extensions { namespace { @@ -154,7 +154,7 @@ index 23d2ab6..b786e2a 100644 // Obtains the current app window. AppWindow* GetCurrentAppWindow(ChromeSyncExtensionFunction* function) { diff --git a/chrome/browser/chromeos/extensions/file_manager/private_api_strings.cc b/chrome/browser/chromeos/extensions/file_manager/private_api_strings.cc -index 6a9c6b7..5a46fab 100644 +index 5f78e2c..10a5459 100644 --- a/chrome/browser/chromeos/extensions/file_manager/private_api_strings.cc +++ b/chrome/browser/chromeos/extensions/file_manager/private_api_strings.cc @@ -19,26 +19,26 @@ namespace { @@ -191,7 +191,7 @@ index 6a9c6b7..5a46fab 100644 // Location of the help page for low space warning in the downloads directory. const int kDownloadsLowSpaceWarningHelpNumber = 1061547; diff --git a/chrome/browser/chromeos/login/signin/oauth2_login_manager.cc b/chrome/browser/chromeos/login/signin/oauth2_login_manager.cc -index 5e046a4..10467c7 100644 +index 8a817cd..12ecccf1 100644 --- a/chrome/browser/chromeos/login/signin/oauth2_login_manager.cc +++ b/chrome/browser/chromeos/login/signin/oauth2_login_manager.cc @@ -31,7 +31,7 @@ namespace chromeos { @@ -204,10 +204,10 @@ index 5e046a4..10467c7 100644 } // namespace diff --git a/chrome/browser/extensions/api/cryptotoken_private/cryptotoken_private_api.cc b/chrome/browser/extensions/api/cryptotoken_private/cryptotoken_private_api.cc -index d16fdb4..4c4091d 100644 +index d3a4ea2..e4fc362 100644 --- a/chrome/browser/extensions/api/cryptotoken_private/cryptotoken_private_api.cc +++ b/chrome/browser/extensions/api/cryptotoken_private/cryptotoken_private_api.cc -@@ -12,8 +12,8 @@ namespace api { +@@ -14,8 +14,8 @@ namespace api { const char kGoogleDotCom[] = "9oo91e.qjz9zk"; const char* kGoogleGstaticAppIds[] = { @@ -219,10 +219,10 @@ index d16fdb4..4c4091d 100644 CryptotokenPrivateCanOriginAssertAppIdFunction:: diff --git a/chrome/browser/extensions/install_signer.cc b/chrome/browser/extensions/install_signer.cc -index 6b7aa35..c68317b 100644 +index 7ce0ccb..22cca4a 100644 --- a/chrome/browser/extensions/install_signer.cc +++ b/chrome/browser/extensions/install_signer.cc -@@ -59,7 +59,7 @@ const int kSignatureFormatVersion = 2; +@@ -65,7 +65,7 @@ const int kSignatureFormatVersion = 2; const size_t kSaltBytes = 32; const char kBackendUrl[] = @@ -232,10 +232,10 @@ index 6b7aa35..c68317b 100644 const char kPublicKeyPEM[] = \ "-----BEGIN PUBLIC KEY-----" \ diff --git a/chrome/browser/first_run/try_chrome_dialog_view.cc b/chrome/browser/first_run/try_chrome_dialog_view.cc -index 47666e6..5f4f9dc 100644 +index 198c3365..5ea1177 100644 --- a/chrome/browser/first_run/try_chrome_dialog_view.cc +++ b/chrome/browser/first_run/try_chrome_dialog_view.cc -@@ -36,7 +36,7 @@ +@@ -38,7 +38,7 @@ namespace { const wchar_t kHelpCenterUrl[] = @@ -245,10 +245,10 @@ index 47666e6..5f4f9dc 100644 enum ButtonTags { BT_NONE, diff --git a/chrome/browser/gpu/three_d_api_observer.cc b/chrome/browser/gpu/three_d_api_observer.cc -index e97e956..176589e 100644 +index 2fa88038..1823ab4 100644 --- a/chrome/browser/gpu/three_d_api_observer.cc +++ b/chrome/browser/gpu/three_d_api_observer.cc -@@ -150,7 +150,7 @@ base::string16 ThreeDAPIInfoBarDelegate::GetLinkText() const { +@@ -157,7 +157,7 @@ base::string16 ThreeDAPIInfoBarDelegate::GetLinkText() const { } GURL ThreeDAPIInfoBarDelegate::GetLinkURL() const { @@ -258,10 +258,10 @@ index e97e956..176589e 100644 diff --git a/chrome/browser/infobars/insecure_content_infobar_delegate.cc b/chrome/browser/infobars/insecure_content_infobar_delegate.cc -index ef14ecd..2e9ee32 100644 +index 8af7856..ea7c17e0 100644 --- a/chrome/browser/infobars/insecure_content_infobar_delegate.cc +++ b/chrome/browser/infobars/insecure_content_infobar_delegate.cc -@@ -98,5 +98,5 @@ base::string16 InsecureContentInfoBarDelegate::GetLinkText() const { +@@ -106,5 +106,5 @@ base::string16 InsecureContentInfoBarDelegate::GetLinkText() const { } GURL InsecureContentInfoBarDelegate::GetLinkURL() const { @@ -281,10 +281,10 @@ index 2859519..35cc695 100644 } // namespace chrome diff --git a/chrome/browser/nacl_host/nacl_infobar_delegate.cc b/chrome/browser/nacl_host/nacl_infobar_delegate.cc -index 0b98c92..31090e9 100644 +index 3bb7131..765d3ce 100644 --- a/chrome/browser/nacl_host/nacl_infobar_delegate.cc +++ b/chrome/browser/nacl_host/nacl_infobar_delegate.cc -@@ -51,5 +51,5 @@ base::string16 NaClInfoBarDelegate::GetLinkText() const { +@@ -56,5 +56,5 @@ base::string16 NaClInfoBarDelegate::GetLinkText() const { } GURL NaClInfoBarDelegate::GetLinkURL() const { @@ -292,10 +292,10 @@ index 0b98c92..31090e9 100644 + return GURL("trk:143:https://support.9oo91e.qjz9zk/chrome/?p=ib_nacl"); } diff --git a/chrome/browser/net/predictor.cc b/chrome/browser/net/predictor.cc -index c435a8c..af77d4f 100644 +index f2d91b9..ea84eeb 100644 --- a/chrome/browser/net/predictor.cc +++ b/chrome/browser/net/predictor.cc -@@ -365,7 +365,7 @@ UrlList Predictor::GetPredictedUrlListAtStartup( +@@ -362,7 +362,7 @@ UrlList Predictor::GetPredictedUrlListAtStartup(PrefService* user_prefs) { } if (urls.empty()) @@ -304,21 +304,6 @@ index c435a8c..af77d4f 100644 return urls; } -diff --git a/chrome/browser/plugins/plugin_infobar_delegates.cc b/chrome/browser/plugins/plugin_infobar_delegates.cc -index 87e5fba..730c252 100644 ---- a/chrome/browser/plugins/plugin_infobar_delegates.cc -+++ b/chrome/browser/plugins/plugin_infobar_delegates.cc -@@ -277,8 +277,8 @@ base::string16 PluginMetroModeInfoBarDelegate::GetLinkText() const { - GURL PluginMetroModeInfoBarDelegate::GetLinkURL() const { - return GURL( - (mode_ == MISSING_PLUGIN) -- ? "https://support.9oo91e.qjz9zk/chrome/?p=ib_display_in_desktop" -- : "https://support.9oo91e.qjz9zk/chrome/?p=ib_redirect_to_desktop"); -+ ? "trk:146:https://support.9oo91e.qjz9zk/chrome/?p=ib_display_in_desktop" -+ : "trk:147:https://support.9oo91e.qjz9zk/chrome/?p=ib_redirect_to_desktop"); - } - - #endif // defined(OS_WIN) diff --git a/chrome/browser/profiles/profile_avatar_downloader.cc b/chrome/browser/profiles/profile_avatar_downloader.cc index 69f4a4c..cd3cab9 100644 --- a/chrome/browser/profiles/profile_avatar_downloader.cc @@ -332,11 +317,27 @@ index 69f4a4c..cd3cab9 100644 } ProfileAvatarDownloader::ProfileAvatarDownloader( +diff --git a/chrome/browser/resources/chromeos/chromevox/chromevox/background/prefs.js b/chrome/browser/resources/chromeos/chromevox/chromevox/background/prefs.js +index a0d64ef..b086021 100644 +--- a/chrome/browser/resources/chromeos/chromevox/chromevox/background/prefs.js ++++ b/chrome/browser/resources/chromeos/chromevox/chromevox/background/prefs.js +@@ -71,9 +71,9 @@ cvox.ChromeVoxPrefs.DEFAULT_PREFS = { + 'granularity': undefined, + 'position': '{}', + 'siteSpecificScriptBase': +- 'https://ssl.95tat1c.qjz9zk/accessibility/javascript/ext/', ++ 'trk:152:https://ssl.95tat1c.qjz9zk/accessibility/javascript/ext/', + 'siteSpecificScriptLoader': +- 'https://ssl.95tat1c.qjz9zk/accessibility/javascript/ext/loader.js', ++ 'trk:153:https://ssl.95tat1c.qjz9zk/accessibility/javascript/ext/loader.js', + 'sticky': false, + 'typingEcho': 0, + 'useIBeamCursor': cvox.ChromeVox.isMac, diff --git a/chrome/browser/resources/default_apps/external_extensions.json b/chrome/browser/resources/default_apps/external_extensions.json -index 39e109a..73c4713 100644 +index 59a0f9a..888e42b 100644 --- a/chrome/browser/resources/default_apps/external_extensions.json +++ b/chrome/browser/resources/default_apps/external_extensions.json -@@ -29,15 +29,15 @@ +@@ -24,15 +24,15 @@ }, // Google Sheets "aapocclcgogkmnckokdopfmhonfmgoek" : { @@ -372,10 +373,10 @@ index ef3186b..c98c3d1 100644 struct ClientSideDetectionService::ClientReportInfo { ClientReportPhishingRequestCallback callback; diff --git a/chrome/browser/safe_browsing/download_feedback.cc b/chrome/browser/safe_browsing/download_feedback.cc -index 27f4008..1e2c88a 100644 +index e792d41..8d2dcc4 100644 --- a/chrome/browser/safe_browsing/download_feedback.cc +++ b/chrome/browser/safe_browsing/download_feedback.cc -@@ -196,7 +196,7 @@ const int64 DownloadFeedback::kMaxUploadSize = 50 * 1024 * 1024; +@@ -197,7 +197,7 @@ const int64_t DownloadFeedback::kMaxUploadSize = 50 * 1024 * 1024; // static const char DownloadFeedback::kSbFeedbackURL[] = @@ -385,7 +386,7 @@ index 27f4008..1e2c88a 100644 // static DownloadFeedbackFactory* DownloadFeedback::factory_ = NULL; diff --git a/chrome/browser/safe_browsing/srt_global_error_win.cc b/chrome/browser/safe_browsing/srt_global_error_win.cc -index 5f1cd48..f81e694 100644 +index db6e4bc..771021a 100644 --- a/chrome/browser/safe_browsing/srt_global_error_win.cc +++ b/chrome/browser/safe_browsing/srt_global_error_win.cc @@ -36,7 +36,7 @@ namespace { @@ -398,10 +399,10 @@ index 5f1cd48..f81e694 100644 // The extension to use to replace the temporary one created when the SRT was // downloaded. diff --git a/chrome/browser/spellchecker/spellcheck_hunspell_dictionary.cc b/chrome/browser/spellchecker/spellcheck_hunspell_dictionary.cc -index 8ce3037..6191aa7 100644 +index deef151..1e65d44 100644 --- a/chrome/browser/spellchecker/spellcheck_hunspell_dictionary.cc +++ b/chrome/browser/spellchecker/spellcheck_hunspell_dictionary.cc -@@ -227,7 +227,7 @@ void SpellcheckHunspellDictionary::OnURLFetchComplete( +@@ -230,7 +230,7 @@ void SpellcheckHunspellDictionary::OnURLFetchComplete( GURL SpellcheckHunspellDictionary::GetDictionaryURL() { static const char kDownloadServerUrl[] = @@ -411,10 +412,10 @@ index 8ce3037..6191aa7 100644 DCHECK(!bdict_file.empty()); diff --git a/chrome/browser/spellchecker/spelling_service_client.cc b/chrome/browser/spellchecker/spelling_service_client.cc -index 888af4a..0cc1781 100644 +index d769b27..aa7f89c 100644 --- a/chrome/browser/spellchecker/spelling_service_client.cc +++ b/chrome/browser/spellchecker/spelling_service_client.cc -@@ -29,7 +29,7 @@ +@@ -31,7 +31,7 @@ namespace { // The URL for requesting spell checking and sending user feedback. @@ -424,10 +425,10 @@ index 888af4a..0cc1781 100644 // The location of spellcheck suggestions in JSON response from spelling // service. diff --git a/chrome/browser/supervised_user/experimental/supervised_user_async_url_checker.cc b/chrome/browser/supervised_user/experimental/supervised_user_async_url_checker.cc -index f2501b4..c72673f 100644 +index 2dd6302..43ec1a3 100644 --- a/chrome/browser/supervised_user/experimental/supervised_user_async_url_checker.cc +++ b/chrome/browser/supervised_user/experimental/supervised_user_async_url_checker.cc -@@ -30,7 +30,7 @@ using net::URLRequestStatus; +@@ -31,7 +31,7 @@ using net::URLRequestStatus; namespace { @@ -437,10 +438,10 @@ index f2501b4..c72673f 100644 const char kDataFormat[] = "key=%s&urls=%s"; diff --git a/chrome/browser/supervised_user/supervised_user_service.cc b/chrome/browser/supervised_user/supervised_user_service.cc -index 1e2f005..8dfe102 100644 +index b96fbf6..2069422 100644 --- a/chrome/browser/supervised_user/supervised_user_service.cc +++ b/chrome/browser/supervised_user/supervised_user_service.cc -@@ -81,7 +81,7 @@ namespace { +@@ -84,7 +84,7 @@ namespace { // The URL from which to download a host blacklist if no local one exists yet. const char kBlacklistURL[] = @@ -450,10 +451,10 @@ index 1e2f005..8dfe102 100644 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 1677b18..47446f4 100644 +index 724faf5..38f78b8 100644 --- a/chrome/browser/ui/app_list/search/people/people_provider.cc +++ b/chrome/browser/ui/app_list/search/people/people_provider.cc -@@ -34,11 +34,11 @@ const char kKeyItems[] = "items"; +@@ -35,11 +35,11 @@ const char kKeyItems[] = "items"; const char kAccessTokenField[] = "access_token"; const char kQueryField[] = "query"; const char kPeopleSearchUrl[] = @@ -468,10 +469,10 @@ index 1677b18..47446f4 100644 } // namespace diff --git a/chrome/browser/ui/views/outdated_upgrade_bubble_view.cc b/chrome/browser/ui/views/outdated_upgrade_bubble_view.cc -index 81972b0..6c4a5c0 100644 +index 85f1f89..0d54ab8 100644 --- a/chrome/browser/ui/views/outdated_upgrade_bubble_view.cc +++ b/chrome/browser/ui/views/outdated_upgrade_bubble_view.cc -@@ -42,7 +42,7 @@ const int kWidthOfDescriptionText = 330; +@@ -43,7 +43,7 @@ const int kWidthOfDescriptionText = 330; const int kButtonPadding = views::kRelatedButtonHSpacing - 2; // The URL to be used to re-install Chrome when auto-update failed for too long. @@ -512,10 +513,10 @@ index 0cfd934..ca35584 100644 MockPermissionBubbleRequest::~MockPermissionBubbleRequest() {} diff --git a/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc b/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc -index 0fb8d9e..1ae1f91 100644 +index df78320..91338a6 100644 --- a/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc +++ b/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc -@@ -78,17 +78,17 @@ namespace { +@@ -79,17 +79,17 @@ namespace { // The URL for the the Learn More page shown on incognito new tab. const char kLearnMoreIncognitoUrl[] = #if defined(OS_CHROMEOS) @@ -538,20 +539,20 @@ index 0fb8d9e..1ae1f91 100644 std::string SkColorToRGBAString(SkColor color) { diff --git a/chrome/chrome_watcher/chrome_watcher_main.cc b/chrome/chrome_watcher/chrome_watcher_main.cc -index 6219bec..44c7bae 100644 +index e28de01..811c5c9 100644 --- a/chrome/chrome_watcher/chrome_watcher_main.cc +++ b/chrome/chrome_watcher/chrome_watcher_main.cc -@@ -339,7 +339,7 @@ extern "C" int WatcherMain(const base::char16* registry_path, - #ifdef KASKO - bool launched_kasko = kasko::api::InitializeReporter( - GetKaskoEndpoint(process.Pid()).c_str(), -- L"https://clients2.9oo91e.qjz9zk/cr/report", -+ L"trk:109:https://clients2.9oo91e.qjz9zk/cr/report", - base::FilePath(browser_data_directory) - .Append(L"Crash Reports") - .value() +@@ -202,7 +202,7 @@ void OnWindowEvent( + void GetKaskoCrashServerUrl(base::string16* crash_server) { + const char kKaskoCrashServerUrl[] = "KASKO_CRASH_SERVER_URL"; + static const wchar_t kDefaultKaskoCrashServerUrl[] = +- L"https://clients2.9oo91e.qjz9zk/cr/report"; ++ L"trk:109:https://clients2.9oo91e.qjz9zk/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 1213fcb..6b86f50 100644 +index eb485b3..f280794 100644 --- a/chrome/common/extensions/chrome_extensions_client.cc +++ b/chrome/common/extensions/chrome_extensions_client.cc @@ -56,9 +56,9 @@ namespace { @@ -567,10 +568,10 @@ index 1213fcb..6b86f50 100644 const char kThumbsWhiteListedExtension[] = "khopmbdjffemhegeeobelklnbglcdgfh"; diff --git a/chrome/common/extensions/extension_constants.cc b/chrome/common/extensions/extension_constants.cc -index 8e8a0f9..67ff558 100644 +index 5a72265..cbc7d53 100644 --- a/chrome/common/extensions/extension_constants.cc +++ b/chrome/common/extensions/extension_constants.cc -@@ -9,7 +9,7 @@ namespace extension_urls { +@@ -11,7 +11,7 @@ namespace extension_urls { namespace { const char kGalleryUpdateHttpsUrl[] = @@ -580,26 +581,23 @@ index 8e8a0f9..67ff558 100644 } // namespace diff --git a/chrome/common/localized_error.cc b/chrome/common/localized_error.cc -index 6fde4f5..14ecc17 100644 +index a00cd5b..215d273 100644 --- a/chrome/common/localized_error.cc +++ b/chrome/common/localized_error.cc -@@ -46,9 +46,9 @@ const unsigned int kErrorPagesNoDetails = 0; +@@ -47,7 +47,7 @@ const unsigned int kErrorPagesNoDetails = 0; namespace { static const char kRedirectLoopLearnMoreUrl[] = - "https://support.9oo91e.qjz9zk/chrome/answer/95626"; + "trk:249:https://support.9oo91e.qjz9zk/chrome/answer/95626"; static const char kWeakDHKeyLearnMoreUrl[] = -- "https://support.9oo91e.qjz9zk/chrome?p=dh_error"; -+ "trk:241:https://support.9oo91e.qjz9zk/chrome?p=dh_error"; + "https://support.9oo91e.qjz9zk/chrome?p=dh_error"; static const int kGoogleCachedCopySuggestionType = 0; - - enum NAV_SUGGESTIONS { diff --git a/chrome/common/url_constants.cc b/chrome/common/url_constants.cc -index df69fef..d65a9de 100644 +index 5e2954c..3980bef 100644 --- a/chrome/common/url_constants.cc +++ b/chrome/common/url_constants.cc -@@ -304,7 +304,7 @@ const char kChromeUIVoiceSearchHost[] = "voicesearch"; +@@ -295,7 +295,7 @@ const char kChromeUIVoiceSearchHost[] = "voicesearch"; const char kEULAPathFormat[] = "/usr/share/chromeos-assets/eula/%s/eula.html"; const char kOemEulaURLPath[] = "oem"; const char kOnlineEulaURLPath[] = @@ -608,7 +606,7 @@ index df69fef..d65a9de 100644 const char kChromeOSCreditsPath[] = "/opt/google/chrome/resources/about_os_credits.html"; -@@ -367,7 +367,7 @@ const char kExtensionResourceInvalidRequestURL[] = +@@ -359,7 +359,7 @@ const char kExtensionResourceInvalidRequestURL[] = "chrome-extension-resource://invalid/"; const char kSyncGoogleDashboardURL[] = @@ -617,7 +615,7 @@ index df69fef..d65a9de 100644 const char kPasswordManagerLearnMoreURL[] = #if defined(OS_CHROMEOS) -@@ -559,7 +559,7 @@ const char kCloudPrintLearnMoreURL[] = +@@ -548,7 +548,7 @@ const char kCloudPrintLearnMoreURL[] = #endif const char kCloudPrintNoDestinationsLearnMoreURL[] = @@ -627,10 +625,10 @@ index df69fef..d65a9de 100644 const char kAppLauncherHelpURL[] = "https://support.9oo91e.qjz9zk/chrome_webstore/?p=cws_app_launcher"; diff --git a/chrome/installer/util/google_chrome_distribution.cc b/chrome/installer/util/google_chrome_distribution.cc -index 7c0992c..6c5e2e1 100644 +index f597a98..a7fe120 100644 --- a/chrome/installer/util/google_chrome_distribution.cc +++ b/chrome/installer/util/google_chrome_distribution.cc -@@ -51,7 +51,7 @@ base::string16 LocalizeUrl(const wchar_t* url) { +@@ -55,7 +55,7 @@ base::string16 LocalizeUrl(const wchar_t* url) { } base::string16 GetUninstallSurveyUrl() { @@ -640,10 +638,10 @@ index 7c0992c..6c5e2e1 100644 return LocalizeUrl(kSurveyUrl); } diff --git a/chrome/installer/util/user_experiment.cc b/chrome/installer/util/user_experiment.cc -index af0bb68..36c4d97 100644 +index 796a79c..32fb88e 100644 --- a/chrome/installer/util/user_experiment.cc +++ b/chrome/installer/util/user_experiment.cc -@@ -60,7 +60,7 @@ base::string16 LocalizeUrl(const wchar_t* url) { +@@ -63,7 +63,7 @@ base::string16 LocalizeUrl(const wchar_t* url) { } base::string16 GetWelcomeBackUrl() { @@ -665,11 +663,24 @@ index 95a497f..1fa210b 100644 GURL url(args[0]); if (url.is_valid() && url.has_scheme()) +diff --git a/chromeos/geolocation/simple_geolocation_provider.cc b/chromeos/geolocation/simple_geolocation_provider.cc +index e083b3e..e7c78ca 100644 +--- a/chromeos/geolocation/simple_geolocation_provider.cc ++++ b/chromeos/geolocation/simple_geolocation_provider.cc +@@ -15,7 +15,7 @@ namespace chromeos { + + namespace { + const char kDefaultGeolocationProviderUrl[] = +- "https://www.9oo91eapis.qjz9zk/geolocation/v1/geolocate?"; ++ "trk:215:https://www.9oo91eapis.qjz9zk/geolocation/v1/geolocate?"; + } // namespace + + SimpleGeolocationProvider::SimpleGeolocationProvider( diff --git a/cloud_print/gcp20/prototype/cloud_print_requester.cc b/cloud_print/gcp20/prototype/cloud_print_requester.cc -index cbfdae4..3ed5a164 100644 +index ccae344..14c7fb6 100644 --- a/cloud_print/gcp20/prototype/cloud_print_requester.cc +++ b/cloud_print/gcp20/prototype/cloud_print_requester.cc -@@ -20,7 +20,7 @@ +@@ -23,7 +23,7 @@ #include "net/url_request/url_request_context.h" #include "url/gurl.h" @@ -679,23 +690,23 @@ index cbfdae4..3ed5a164 100644 namespace { diff --git a/cloud_print/service/service_state.cc b/cloud_print/service/service_state.cc -index 070d4ef7..9699f19 100644 +index 1c644ce..25fa773 100644 --- a/cloud_print/service/service_state.cc +++ b/cloud_print/service/service_state.cc -@@ -33,7 +33,7 @@ const char kRobotTokenOptionName[] = "robot_refresh_token"; +@@ -36,7 +36,7 @@ const char kRobotTokenOptionName[] = "robot_refresh_token"; const char kAuthTokenOptionName[] = "auth_token"; const char kXmppAuthTokenOptionName[] = "xmpp_auth_token"; -const char kClientLoginUrl[] = "https://www.9oo91e.qjz9zk/accounts/ClientLogin"; +const char kClientLoginUrl[] = "trk:258:https://www.9oo91e.qjz9zk/accounts/ClientLogin"; - const int64 kRequestTimeoutMs = 10 * 1000; + const int64_t kRequestTimeoutMs = 10 * 1000; diff --git a/cloud_print/virtual_driver/win/install/setup.cc b/cloud_print/virtual_driver/win/install/setup.cc -index 9032258..366fc84 100644 +index afb5954..aa7848f 100644 --- a/cloud_print/virtual_driver/win/install/setup.cc +++ b/cloud_print/virtual_driver/win/install/setup.cc -@@ -36,7 +36,7 @@ namespace { +@@ -38,7 +38,7 @@ namespace { const wchar_t kNameValue[] = L"GCP Virtual Driver"; const wchar_t kUninstallId[] = L"{74AA24E0-AC50-4B28-BA46-9CF05467C9B7}"; @@ -705,20 +716,16 @@ index 9032258..366fc84 100644 const wchar_t kDataFileName[] = L"gcp_driver.gpd"; const wchar_t kDriverName[] = L"MXDWDRV.DLL"; diff --git a/components/cloud_devices/common/cloud_devices_urls.cc b/components/cloud_devices/common/cloud_devices_urls.cc -index 5a9a15e4..9a1319e 100644 +index 7b4b711..5e58255 100644 --- a/components/cloud_devices/common/cloud_devices_urls.cc +++ b/components/cloud_devices/common/cloud_devices_urls.cc -@@ -14,25 +14,25 @@ +@@ -14,20 +14,20 @@ namespace cloud_devices { const char kCloudPrintAuthScope[] = - "https://www.9oo91eapis.qjz9zk/auth/cloudprint"; + "trk:197:https://www.9oo91eapis.qjz9zk/auth/cloudprint"; - const char kCloudDevicesAuthScope[] = -- "https://www.9oo91eapis.qjz9zk/auth/clouddevices"; -+ "trk:198:https://www.9oo91eapis.qjz9zk/auth/clouddevices"; - const char kCloudPrintLearnMoreURL[] = - "https://www.9oo91e.qjz9zk/support/cloudprint"; + "trk:199:https://www.9oo91e.qjz9zk/support/cloudprint"; @@ -735,16 +742,13 @@ index 5a9a15e4..9a1319e 100644 -const char kCloudPrintURL[] = "https://www.9oo91e.qjz9zk/cloudprint"; +const char kCloudPrintURL[] = "trk:201:https://www.9oo91e.qjz9zk/cloudprint"; --const char kCloudDevicesUrl[] = "https://www.9oo91eapis.qjz9zk/clouddevices/v1"; -+const char kCloudDevicesUrl[] = "trk:202:https://www.9oo91eapis.qjz9zk/clouddevices/v1"; - } diff --git a/components/copresence/rpc/rpc_handler.cc b/components/copresence/rpc/rpc_handler.cc -index 22be6e2..a50565d 100644 +index d3ce789..069db42 100644 --- a/components/copresence/rpc/rpc_handler.cc +++ b/components/copresence/rpc/rpc_handler.cc -@@ -50,7 +50,7 @@ const int kInvalidTokenExpiryTimeMinutes = 10; +@@ -54,7 +54,7 @@ const int kInvalidTokenExpiryTimeMinutes = 10; const int kMaxInvalidTokens = 10000; const char kRegisterDeviceRpcName[] = "registerdevice"; const char kDefaultCopresenceServer[] = @@ -754,10 +758,10 @@ index 22be6e2..a50565d 100644 // UrlSafe is defined as: // '/' represented by a '_' and '+' represented by a '-' diff --git a/components/crash/content/app/breakpad_linux.cc b/components/crash/content/app/breakpad_linux.cc -index f93dda7..ba0b28c 100644 +index 3435f04..741f0e2 100644 --- a/components/crash/content/app/breakpad_linux.cc +++ b/components/crash/content/app/breakpad_linux.cc -@@ -83,7 +83,7 @@ namespace breakpad { +@@ -87,7 +87,7 @@ namespace breakpad { namespace { #if !defined(OS_CHROMEOS) @@ -767,10 +771,10 @@ index f93dda7..ba0b28c 100644 bool g_is_crash_reporter_enabled = false; diff --git a/components/crash/content/tools/crash_service.cc b/components/crash/content/tools/crash_service.cc -index ed55bbf..48e8060 100644 +index 38f94f7..f50b3fd 100644 --- a/components/crash/content/tools/crash_service.cc +++ b/components/crash/content/tools/crash_service.cc -@@ -24,7 +24,7 @@ namespace { +@@ -26,7 +26,7 @@ namespace { const wchar_t kTestPipeName[] = L"\\\\.\\pipe\\ChromeCrashServices"; @@ -780,10 +784,10 @@ index ed55bbf..48e8060 100644 typedef std::map CrashMap; diff --git a/components/drive/service/drive_api_service.cc b/components/drive/service/drive_api_service.cc -index 2f47fe6..f485494 100644 +index 91c0225..ed7029f 100644 --- a/components/drive/service/drive_api_service.cc +++ b/components/drive/service/drive_api_service.cc -@@ -71,11 +71,11 @@ namespace drive { +@@ -73,11 +73,11 @@ namespace drive { namespace { // OAuth2 scopes for Drive API. @@ -800,10 +804,10 @@ index 2f47fe6..f485494 100644 // Mime type to create a directory. const char kFolderMimeType[] = "application/vnd.google-apps.folder"; diff --git a/components/enhanced_bookmarks/bookmark_server_cluster_service.cc b/components/enhanced_bookmarks/bookmark_server_cluster_service.cc -index d58bf5c..6f6413b 100644 +index cf34176..f9a72f8 100644 --- a/components/enhanced_bookmarks/bookmark_server_cluster_service.cc +++ b/components/enhanced_bookmarks/bookmark_server_cluster_service.cc -@@ -24,7 +24,7 @@ +@@ -26,7 +26,7 @@ using bookmarks::BookmarkNode; namespace { @@ -813,23 +817,23 @@ index d58bf5c..6f6413b 100644 const char kPrefServiceVersionKey[] = "version"; const char kPrefServiceDataKey[] = "data"; diff --git a/components/feedback/feedback_uploader.cc b/components/feedback/feedback_uploader.cc -index b79ece2..a0223b6 100644 +index e278177..6ec309b 100644 --- a/components/feedback/feedback_uploader.cc +++ b/components/feedback/feedback_uploader.cc -@@ -16,7 +16,7 @@ namespace feedback { +@@ -18,7 +18,7 @@ namespace feedback { namespace { const char kFeedbackPostUrl[] = - "https://www.9oo91e.qjz9zk/tools/feedback/chrome/__submit"; + "trk:194:https://www.9oo91e.qjz9zk/tools/feedback/chrome/__submit"; - const int64 kRetryDelayMinutes = 60; + const int64_t kRetryDelayMinutes = 60; diff --git a/components/gcm_driver/gcm_account_tracker.cc b/components/gcm_driver/gcm_account_tracker.cc -index 231ad43..997549b 100644 +index 06c0866..1a2071a 100644 --- a/components/gcm_driver/gcm_account_tracker.cc +++ b/components/gcm_driver/gcm_account_tracker.cc -@@ -21,9 +21,9 @@ namespace gcm { +@@ -23,9 +23,9 @@ namespace gcm { namespace { // Scopes needed by the OAuth2 access tokens. @@ -842,23 +846,20 @@ index 231ad43..997549b 100644 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 3def0c2..0f31c9b 100644 +index d71754a..c22d40e 100644 --- a/components/google/core/browser/google_url_tracker.cc +++ b/components/google/core/browser/google_url_tracker.cc -@@ -22,9 +22,9 @@ - - +@@ -34,7 +34,7 @@ + * (So the naming problem was spotted, yet remains unfixed even today…) + */ const char GoogleURLTracker::kDefaultGoogleHomepage[] = - "https://www.9oo91e.qjz9zk/"; + "trk:192:https://www.9oo91e.qjz9zk/"; const char GoogleURLTracker::kSearchDomainCheckURL[] = -- "https://www.9oo91e.qjz9zk/searchdomaincheck?format=domain&type=chrome"; -+ "trk:193:https://www.9oo91e.qjz9zk/searchdomaincheck?format=domain&type=chrome"; + /* trk:193: */ "https://www.9oo91e.qjz9zk/searchdomaincheck?format=domain&type=chrome"; - GoogleURLTracker::GoogleURLTracker(scoped_ptr client, - Mode mode) diff --git a/components/history/core/browser/web_history_service.cc b/components/history/core/browser/web_history_service.cc -index b830faf..eb5c00c 100644 +index 392db72..dc870da 100644 --- a/components/history/core/browser/web_history_service.cc +++ b/components/history/core/browser/web_history_service.cc @@ -30,13 +30,13 @@ namespace history { @@ -879,10 +880,10 @@ index b830faf..eb5c00c 100644 const char kHistoryAudioHistoryUrl[] = "https://history.9oo91e.qjz9zk/history/api/lookup?client=audio"; diff --git a/components/invalidation/impl/gcm_network_channel.cc b/components/invalidation/impl/gcm_network_channel.cc -index 7e664464..5292657 100644 +index 3960b60..3034483 100644 --- a/components/invalidation/impl/gcm_network_channel.cc +++ b/components/invalidation/impl/gcm_network_channel.cc -@@ -32,7 +32,7 @@ namespace syncer { +@@ -37,7 +37,7 @@ namespace syncer { namespace { const char kCacheInvalidationEndpointUrl[] = @@ -892,10 +893,10 @@ index 7e664464..5292657 100644 // Register backoff policy. diff --git a/components/invalidation/impl/p2p_invalidator.cc b/components/invalidation/impl/p2p_invalidator.cc -index 4f39cbd..9716c9b 100644 +index 2c2ce2f..8c7645e 100644 --- a/components/invalidation/impl/p2p_invalidator.cc +++ b/components/invalidation/impl/p2p_invalidator.cc -@@ -19,7 +19,7 @@ +@@ -20,7 +20,7 @@ namespace syncer { @@ -918,10 +919,10 @@ index 55d9e13..5f17829 100644 } // namespace metrics diff --git a/components/password_manager/core/browser/password_store.cc b/components/password_manager/core/browser/password_store.cc -index 4eef17c..c63d484 100644 +index 52bb385..d3c234a 100644 --- a/components/password_manager/core/browser/password_store.cc +++ b/components/password_manager/core/browser/password_store.cc -@@ -160,10 +160,10 @@ void PasswordStore::GetLogins(const PasswordForm& form, +@@ -165,10 +165,10 @@ void PasswordStore::GetLogins(const PasswordForm& form, // TODO(mdm): actually delete them at some point, say M24 or so. base::Time ignore_logins_cutoff; // the null time if (form.scheme == PasswordForm::SCHEME_HTML && @@ -937,23 +938,23 @@ index 4eef17c..c63d484 100644 { 2012, 1, 0, 1, 0, 0, 0, 0 }; // 00:00 Jan 1 2012 ignore_logins_cutoff = base::Time::FromUTCExploded(exploded_cutoff); diff --git a/components/policy/core/common/policy_loader_win.cc b/components/policy/core/common/policy_loader_win.cc -index 0ed6714..40206ae 100644 +index d2475ca..bc70699 100644 --- a/components/policy/core/common/policy_loader_win.cc +++ b/components/policy/core/common/policy_loader_win.cc -@@ -70,7 +70,7 @@ const char kLegacyBrowserSupportExtensionId[] = +@@ -71,7 +71,7 @@ const char kLegacyBrowserSupportExtensionId[] = // The web store url that is the only trusted source for extensions. const char kExpectedWebStoreUrl[] = - ";https://clients2.9oo91e.qjz9zk/service/update2/crx"; -+ ";trk:15:https://clients2.9oo91e.qjz9zk/service/update2/crx"; ++ ";trk:15:https://cache.iridiumbrowser.de/clients2.9oo91e.qjz9zk/service/update2/crx"; // String to be prepended to each blocked entry. const char kBlockedExtensionPrefix[] = "[BLOCKED]"; diff --git a/components/policy/resources/policy_templates.json b/components/policy/resources/policy_templates.json -index 273f7a8..a01734a 100644 +index d32fe4f..7090b6f 100644 --- a/components/policy/resources/policy_templates.json +++ b/components/policy/resources/policy_templates.json -@@ -2005,7 +2005,7 @@ +@@ -2008,7 +2008,7 @@ 'dynamic_refresh': True, 'per_profile': True, }, @@ -962,7 +963,7 @@ index 273f7a8..a01734a 100644 'id': 34, 'caption': '''Configure the list of force-installed apps and extensions''', 'tags': ['full-admin-access'], -@@ -2048,7 +2048,7 @@ +@@ -2051,7 +2051,7 @@ URL indicated in the extension's manifest. For example, Chrome Remote Desktop app from the standard Chrome Web Store "update" URL. For more information about hosting extensions, see: '); }; +diff --git a/remoting/webapp/crd/manifest.json.jinja2 b/remoting/webapp/crd/manifest.json.jinja2 +index 30ac60e..9d4f591 100644 +--- a/remoting/webapp/crd/manifest.json.jinja2 ++++ b/remoting/webapp/crd/manifest.json.jinja2 +@@ -24,7 +24,7 @@ + "client_id": "{{ REMOTING_IDENTITY_API_CLIENT_ID }}", + "scopes": [ + {% if USE_GCD %} +- "https://www.9oo91eapis.qjz9zk/auth/clouddevices", ++ "trk:198:https://www.9oo91eapis.qjz9zk/auth/clouddevices", + {% endif %} + "https://www.9oo91eapis.qjz9zk/auth/chromoting", + "https://www.9oo91eapis.qjz9zk/auth/googletalk", +diff --git a/rlz/lib/lib_values.cc b/rlz/lib/lib_values.cc +index 1829993..023f13f 100644 +--- a/rlz/lib/lib_values.cc ++++ b/rlz/lib/lib_values.cc +@@ -41,7 +41,7 @@ const char kSetDccResponseVariable[] = "set_dcc"; + // + + const char kFinancialPingPath[] = "/tools/pso/ping"; +-const char kFinancialServer[] = "clients1.9oo91e.qjz9zk"; ++const char kFinancialServer[] = "cache.iridiumbrowser.de/clients1.9oo91e.qjz9zk"; /* not using URLRequest! catch with cache.ir */ + const int kFinancialPort = 80; + + // Ping times in 100-nanosecond intervals. diff --git a/sync/tools/sync_client.cc b/sync/tools/sync_client.cc -index d8653ec..6ded535 100644 +index deba666..89179d2 100644 --- a/sync/tools/sync_client.cc +++ b/sync/tools/sync_client.cc -@@ -66,7 +66,7 @@ const char kXmppHostPortSwitch[] = "xmpp-host-port"; +@@ -69,7 +69,7 @@ const char kXmppHostPortSwitch[] = "xmpp-host-port"; const char kXmppTrySslTcpFirstSwitch[] = "xmpp-try-ssltcp-first"; const char kXmppAllowInsecureConnectionSwitch[] = "xmpp-allow-insecure-connection"; @@ -1303,10 +1345,10 @@ index d8653ec..6ded535 100644 // Needed to use a real host resolver. class MyTestURLRequestContext : public net::TestURLRequestContext { diff --git a/ui/app_list/demo/app_list_demo_views.cc b/ui/app_list/demo/app_list_demo_views.cc -index dc71701..4659ce3 100644 +index f184480..07ab5df 100644 --- a/ui/app_list/demo/app_list_demo_views.cc +++ b/ui/app_list/demo/app_list_demo_views.cc -@@ -95,7 +95,7 @@ views::View* DemoAppListViewDelegate::CreateStartPageWebView( +@@ -99,7 +99,7 @@ views::View* DemoAppListViewDelegate::CreateStartPageWebView( const gfx::Size& size) { web_contents_.reset(content::WebContents::Create( content::WebContents::CreateParams(browser_context_))); @@ -1329,5 +1371,5 @@ index ccde6d7..c14a13a 100644 } -- -2.4.3 +2.6.2 diff --git a/patches/iridium-browser/autofill-disable-autofill-download-manager.patch b/patches/iridium-browser/autofill-disable-autofill-download-manager.patch index c289500e..65ad680f 100644 --- a/patches/iridium-browser/autofill-disable-autofill-download-manager.patch +++ b/patches/iridium-browser/autofill-disable-autofill-download-manager.patch @@ -1,7 +1,7 @@ -From 7ff63c9f6fcc9d65cd7860b47ecc40de24f0607c Mon Sep 17 00:00:00 2001 +From e02b16d3c278d09d68c3d93723659e9e306e442c Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Thu, 11 Sep 2014 16:37:32 +0200 -Subject: [PATCH 10/56] autofill: disable autofill download manager +Subject: [PATCH 09/57] autofill: disable autofill download manager Disables the autofill download manager (trk:158). --- @@ -10,10 +10,10 @@ Disables the autofill download manager (trk:158). 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 ffe6312..cb473de 100644 +index 45f1e95..c99e8a7 100644 --- a/components/autofill/core/browser/autofill_download_manager.cc +++ b/components/autofill/core/browser/autofill_download_manager.cc -@@ -57,7 +57,7 @@ std::string RequestTypeToString(AutofillDownloadManager::RequestType type) { +@@ -87,7 +87,7 @@ std::string RequestTypeToString(AutofillDownloadManager::RequestType type) { } GURL GetRequestUrl(AutofillDownloadManager::RequestType request_type) { @@ -23,22 +23,21 @@ index ffe6312..cb473de 100644 } diff --git a/components/autofill/core/browser/autofill_manager.cc b/components/autofill/core/browser/autofill_manager.cc -index 5443327..22064e3 100644 +index 4c346f6..40fd35c 100644 --- a/components/autofill/core/browser/autofill_manager.cc +++ b/components/autofill/core/browser/autofill_manager.cc -@@ -157,10 +157,12 @@ AutofillManager::AutofillManager( +@@ -127,9 +127,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, client_->GetPrefs(), this)); + download_manager_.reset(new AutofillDownloadManager(driver, this)); } +#endif + CountryNames::SetLocaleString(app_locale_); } - AutofillManager::~AutofillManager() {} -- -2.4.3 +2.6.2 diff --git a/patches/iridium-browser/battery_status_service-disable-more-privacy-nightmar.patch b/patches/iridium-browser/battery_status_service-disable-more-privacy-nightmar.patch index 82cb1c21..9a741802 100644 --- a/patches/iridium-browser/battery_status_service-disable-more-privacy-nightmar.patch +++ b/patches/iridium-browser/battery_status_service-disable-more-privacy-nightmar.patch @@ -1,7 +1,7 @@ -From a8f7d19b24c3541893750056dbab75dd58e94fba Mon Sep 17 00:00:00 2001 +From aab89d66fe21e14c7edccf0bc3c238f2525f66b5 Mon Sep 17 00:00:00 2001 From: Joachim Bauch Date: Tue, 4 Aug 2015 15:15:53 +0200 -Subject: [PATCH 54/56] battery_status_service: disable more privacy nightmares +Subject: [PATCH 53/57] battery_status_service: disable more privacy nightmares The W3C Battery Status API[1] has quite a laughable statement: @@ -23,10 +23,10 @@ References: https://github.com/iridium-browser/iridium-browser/issues/40 1 file changed, 5 insertions(+) diff --git a/device/battery/battery_status_service.cc b/device/battery/battery_status_service.cc -index 453adb7..33430c2 100644 +index 6b3c34c..48b9548 100644 --- a/device/battery/battery_status_service.cc +++ b/device/battery/battery_status_service.cc -@@ -40,6 +40,7 @@ BatteryStatusService::AddCallback(const BatteryUpdateCallback& callback) { +@@ -42,6 +42,7 @@ BatteryStatusService::AddCallback(const BatteryUpdateCallback& callback) { if (!battery_fetcher_) battery_fetcher_ = BatteryStatusManager::Create(update_callback_); @@ -34,7 +34,7 @@ index 453adb7..33430c2 100644 if (callback_list_.empty()) { bool success = battery_fetcher_->StartListeningBatteryChange(); // On failure pass the default values back. -@@ -51,6 +52,10 @@ BatteryStatusService::AddCallback(const BatteryUpdateCallback& callback) { +@@ -53,6 +54,10 @@ BatteryStatusService::AddCallback(const BatteryUpdateCallback& callback) { // Send recent status to the new callback if already available. callback.Run(status_); } @@ -46,5 +46,5 @@ index 453adb7..33430c2 100644 return callback_list_.Add(callback); } -- -2.4.3 +2.6.2 diff --git a/patches/iridium-browser/browser-disable-profile-auto-import-on-first-run.patch b/patches/iridium-browser/browser-disable-profile-auto-import-on-first-run.patch index 02a6ed89..d1fa534d 100644 --- a/patches/iridium-browser/browser-disable-profile-auto-import-on-first-run.patch +++ b/patches/iridium-browser/browser-disable-profile-auto-import-on-first-run.patch @@ -1,17 +1,17 @@ -From eb46ffbf70ca991f2ef3c318bfb58c74e2e81f49 Mon Sep 17 00:00:00 2001 +From fec0c4f78c2be30d8f672d11080348ac664d0665 Mon Sep 17 00:00:00 2001 From: Joachim Bauch Date: Thu, 25 Jun 2015 15:51:59 +0200 -Subject: [PATCH 52/56] browser: disable profile auto-import on first run +Subject: [PATCH 51/57] browser: disable profile auto-import on first run --- chrome/browser/chrome_browser_main.cc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/chrome/browser/chrome_browser_main.cc b/chrome/browser/chrome_browser_main.cc -index ba4ce89..eacec8f 100644 +index 512df64..6efa001 100644 --- a/chrome/browser/chrome_browser_main.cc +++ b/chrome/browser/chrome_browser_main.cc -@@ -1475,11 +1475,13 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() { +@@ -1487,11 +1487,13 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() { // preferences are registered, since some of the code that the importer // touches reads preferences. if (first_run::IsChromeFirstRun()) { @@ -26,5 +26,5 @@ index ba4ce89..eacec8f 100644 // Note: this can pop the first run consent dialog on linux. first_run::DoPostImportTasks(profile_, -- -2.4.3 +2.6.2 diff --git a/patches/iridium-browser/browser-ui-disable-warning-about-missing-API-keys.patch b/patches/iridium-browser/browser-ui-disable-warning-about-missing-API-keys.patch index 32fda549..e649b0f8 100644 --- a/patches/iridium-browser/browser-ui-disable-warning-about-missing-API-keys.patch +++ b/patches/iridium-browser/browser-ui-disable-warning-about-missing-API-keys.patch @@ -1,7 +1,7 @@ -From 033fd9cc4ed3b2a884352b96482b6dd3a8449900 Mon Sep 17 00:00:00 2001 +From a5733088f0c2c94084ab6d2de9c741a6dabb9ace Mon Sep 17 00:00:00 2001 From: Joachim Bauch Date: Tue, 9 Dec 2014 17:19:41 +0100 -Subject: [PATCH 07/56] browser-ui: disable warning about missing API keys +Subject: [PATCH 07/57] browser-ui: disable warning about missing API keys We do not want to use the services anyway ;) --- @@ -9,7 +9,7 @@ We do not want to use the services anyway ;) 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 537664d..e276930 100644 +index e032c15..72bac40 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 @@ @@ -21,5 +21,5 @@ index 537664d..e276930 100644 return; -- -2.4.3 +2.6.2 diff --git a/patches/iridium-browser/build-build-the-sandbox-with-PIE.patch b/patches/iridium-browser/build-build-the-sandbox-with-PIE.patch index 64d51fa1..53ddfaa3 100644 --- a/patches/iridium-browser/build-build-the-sandbox-with-PIE.patch +++ b/patches/iridium-browser/build-build-the-sandbox-with-PIE.patch @@ -1,7 +1,7 @@ -From 2df4c9b7ea93e521f2426e1a4faf9a35596da165 Mon Sep 17 00:00:00 2001 +From 495fb9ca8d6689ca61c96962bacfa7e626a1bf92 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Thu, 29 Jan 2015 10:39:51 +0100 -Subject: [PATCH 32/56] build: build the sandbox with PIE +Subject: [PATCH 31/57] build: build the sandbox with PIE (Position Independent Executable.) This patch originally from openSUSE, chromium-sandbox-pie.patch. @@ -10,7 +10,7 @@ This patch originally from openSUSE, chromium-sandbox-pie.patch. 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sandbox/linux/sandbox_linux.gypi b/sandbox/linux/sandbox_linux.gypi -index 4df0f1b..7931969 100644 +index f5b3e0f..f57fbf3 100644 --- a/sandbox/linux/sandbox_linux.gypi +++ b/sandbox/linux/sandbox_linux.gypi @@ -205,7 +205,10 @@ @@ -26,5 +26,5 @@ index 4df0f1b..7931969 100644 'include_dirs': [ '../..', -- -2.4.3 +2.6.2 diff --git a/patches/iridium-browser/build-use-Wl-no-keep-memory.patch b/patches/iridium-browser/build-use-Wl-no-keep-memory.patch new file mode 100644 index 00000000..c6b1fae3 --- /dev/null +++ b/patches/iridium-browser/build-use-Wl-no-keep-memory.patch @@ -0,0 +1,31 @@ +From dae3cb7899ea0e2ae65c5e20f49de0c3bd0fc334 Mon Sep 17 00:00:00 2001 +From: Jan Engelhardt +Date: Sun, 20 Dec 2015 11:12:00 +0100 +Subject: [PATCH 55/57] build: use -Wl,--no-keep-memory + +--- + chrome/chrome_exe.gypi | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/chrome/chrome_exe.gypi b/chrome/chrome_exe.gypi +index c9bc7a8..0e427e2 100644 +--- a/chrome/chrome_exe.gypi ++++ b/chrome/chrome_exe.gypi +@@ -76,6 +76,14 @@ + 'app/main_dll_loader_win.cc', + 'app/main_dll_loader_win.h', + ], ++ # Hey, I know what would be an awesome idea. ++ # Let us statically compile EVERYTHING into one giant ++ # freaking executable. Too bad this means we can't build ++ # natively on an IA32 machine. If only someone would ++ # invent shared library objects. Idiots. ++ 'ldflags': [ ++ '-Wl,--no-keep-memory' ++ ], + 'mac_bundle_resources': [ + 'app/app-Info.plist', + ], +-- +2.6.2 + diff --git a/patches/iridium-browser/cloud-print-disable-in-prefs-and-component-loader.patch b/patches/iridium-browser/cloud-print-disable-in-prefs-and-component-loader.patch index 915014c1..6a6e3973 100644 --- a/patches/iridium-browser/cloud-print-disable-in-prefs-and-component-loader.patch +++ b/patches/iridium-browser/cloud-print-disable-in-prefs-and-component-loader.patch @@ -1,7 +1,7 @@ -From dc7c8adfe68488dcc4467c32904bd34d98011130 Mon Sep 17 00:00:00 2001 +From d35f973c5ad906448f98ef89991ee70ad4883112 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Sat, 13 Sep 2014 16:55:12 +0200 -Subject: [PATCH 16/56] cloud-print: disable in prefs and component loader +Subject: [PATCH 15/57] 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 @@ -16,10 +16,10 @@ be off by default. 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/chrome/browser/extensions/component_loader.cc b/chrome/browser/extensions/component_loader.cc -index e92e237..d4f347b 100644 +index ac23b38..c195f2f 100644 --- a/chrome/browser/extensions/component_loader.cc +++ b/chrome/browser/extensions/component_loader.cc -@@ -556,10 +556,12 @@ void ComponentLoader::AddDefaultComponentExtensions( +@@ -555,10 +555,12 @@ void ComponentLoader::AddDefaultComponentExtensions( DCHECK(!skip_session_components); Add(IDR_BOOKMARKS_MANIFEST, base::FilePath(FILE_PATH_LITERAL("bookmark_manager"))); @@ -33,10 +33,10 @@ index e92e237..d4f347b 100644 if (!skip_session_components) { AddWebStoreApp(); diff --git a/chrome/browser/ui/browser_ui_prefs.cc b/chrome/browser/ui/browser_ui_prefs.cc -index d9741ec..c4b2204 100644 +index a23100f..50cae0d 100644 --- a/chrome/browser/ui/browser_ui_prefs.cc +++ b/chrome/browser/ui/browser_ui_prefs.cc -@@ -97,7 +97,7 @@ void RegisterBrowserUserPrefs(user_prefs::PrefRegistrySyncable* registry) { +@@ -87,7 +87,7 @@ void RegisterBrowserUserPrefs(user_prefs::PrefRegistrySyncable* registry) { user_prefs::PrefRegistrySyncable::SYNCABLE_PREF); registry->RegisterStringPref(prefs::kCloudPrintEmail, std::string()); registry->RegisterBooleanPref(prefs::kCloudPrintProxyEnabled, true); @@ -46,10 +46,10 @@ index d9741ec..c4b2204 100644 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 eda0cdc..15cde3c 100644 +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 -@@ -140,10 +140,6 @@ void LocalDiscoveryUI::RegisterProfilePrefs( +@@ -142,10 +142,6 @@ void LocalDiscoveryUI::RegisterProfilePrefs( user_prefs::PrefRegistrySyncable* registry) { registry->RegisterBooleanPref( prefs::kLocalDiscoveryNotificationsEnabled, @@ -61,5 +61,5 @@ index eda0cdc..15cde3c 100644 user_prefs::PrefRegistrySyncable::SYNCABLE_PREF); } -- -2.4.3 +2.6.2 diff --git a/patches/iridium-browser/dns-send-IPv6-connectivity-probes-to-RIPE-DNS-rather.patch b/patches/iridium-browser/dns-send-IPv6-connectivity-probes-to-RIPE-DNS-rather.patch index 15447e3e..9dc63a8c 100644 --- a/patches/iridium-browser/dns-send-IPv6-connectivity-probes-to-RIPE-DNS-rather.patch +++ b/patches/iridium-browser/dns-send-IPv6-connectivity-probes-to-RIPE-DNS-rather.patch @@ -1,7 +1,7 @@ -From 3bb0c73d0f6416895e9621ab0c7c8f1b5542e671 Mon Sep 17 00:00:00 2001 +From 636bdae64b8e7b1acd7213312bd29064e37b5a93 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Mon, 15 Sep 2014 10:58:42 +0200 -Subject: [PATCH 04/56] dns: send IPv6 connectivity probes to RIPE DNS rather +Subject: [PATCH 04/57] dns: send IPv6 connectivity probes to RIPE DNS rather than Google Short of disabling the code (we may do that in a subsequent patch @@ -11,10 +11,10 @@ anyway), avoid sending to Google. 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/net/dns/host_resolver_impl.cc b/net/dns/host_resolver_impl.cc -index 97345a0..16fe64a 100644 +index 16970cd..86dab6d 100644 --- a/net/dns/host_resolver_impl.cc +++ b/net/dns/host_resolver_impl.cc -@@ -78,10 +78,10 @@ const unsigned kMinimumTTLSeconds = kCacheEntryTTLSeconds; +@@ -81,10 +81,10 @@ const unsigned kMinimumTTLSeconds = kCacheEntryTTLSeconds; // cached. const int kIPv6ProbePeriodMs = 1000; @@ -29,5 +29,5 @@ index 97345a0..16fe64a 100644 // 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.4.3 +2.6.2 diff --git a/patches/iridium-browser/extensions-always-show-component-extensions-in-the-e.patch b/patches/iridium-browser/extensions-always-show-component-extensions-in-the-e.patch index 711cd812..2e43a1e7 100644 --- a/patches/iridium-browser/extensions-always-show-component-extensions-in-the-e.patch +++ b/patches/iridium-browser/extensions-always-show-component-extensions-in-the-e.patch @@ -1,7 +1,7 @@ -From 2e09bc7bc90e747406b930da573b5e51e497c25e Mon Sep 17 00:00:00 2001 +From fb5985acc9516d47764927f3cc1ecbd5a4e28431 Mon Sep 17 00:00:00 2001 From: Joachim Bauch Date: Thu, 25 Jun 2015 15:34:10 +0200 -Subject: [PATCH 53/56] extensions: always show component extensions in the ext +Subject: [PATCH 52/57] extensions: always show component extensions in the ext list The attached patch makes sure that component extensions are always @@ -18,10 +18,10 @@ References: https://github.com/iridium-browser/iridium-browser/issues/28 1 file changed, 2 insertions(+) diff --git a/extensions/common/extension.cc b/extensions/common/extension.cc -index 4232509..49dfd43 100644 +index 3f7e43b..a13f2f6 100644 --- a/extensions/common/extension.cc +++ b/extensions/common/extension.cc -@@ -349,6 +349,7 @@ bool Extension::ShouldDisplayInExtensionSettings() const { +@@ -352,6 +352,7 @@ bool Extension::ShouldDisplayInExtensionSettings() const { } bool Extension::ShouldNotBeVisible() const { @@ -29,7 +29,7 @@ index 4232509..49dfd43 100644 // Don't show component extensions because they are only extensions as an // implementation detail of Chrome. if (extensions::Manifest::IsComponentLocation(location()) && -@@ -365,6 +366,7 @@ bool Extension::ShouldNotBeVisible() const { +@@ -368,6 +369,7 @@ bool Extension::ShouldNotBeVisible() const { if (is_app() && !ShouldDisplayInAppLauncher() && !ShouldDisplayInNewTabPage()) return true; @@ -38,5 +38,5 @@ index 4232509..49dfd43 100644 } -- -2.4.3 +2.6.2 diff --git a/patches/iridium-browser/first_run-barf-if-metrics_reporting-is-activated.patch b/patches/iridium-browser/first_run-barf-if-metrics_reporting-is-activated.patch index d84e4646..d8bd717b 100644 --- a/patches/iridium-browser/first_run-barf-if-metrics_reporting-is-activated.patch +++ b/patches/iridium-browser/first_run-barf-if-metrics_reporting-is-activated.patch @@ -1,7 +1,7 @@ -From 072f26722b1a0a19f0c56e477346d9a90f6c85a1 Mon Sep 17 00:00:00 2001 +From cf0a54069133f9df4535e154900a36cc12b1c929 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Sat, 13 Sep 2014 16:40:17 +0200 -Subject: [PATCH 22/56] first_run: barf if metrics_reporting is activated +Subject: [PATCH 21/57] first_run: barf if metrics_reporting is activated MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -17,7 +17,7 @@ disabled, as no message is emitted. 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 6e97dd8..a5dc39b 100644 +index eec6d16..1e2aa68 100644 --- a/chrome/browser/first_run/first_run_internal_posix.cc +++ b/chrome/browser/first_run/first_run_internal_posix.cc @@ -17,6 +17,7 @@ @@ -32,10 +32,10 @@ index 6e97dd8..a5dc39b 100644 // the pref (on Windows, the download is tagged with enable/disable stats so // this is POSIX-specific). if (GoogleUpdateSettings::GetCollectStatsConsent()) { -+ fprintf(stderr, "***ungoogled-chromium custom message*** metrics_reporting = 1\n"); ++ fprintf(stderr, "*** metrics_reporting = 1\n"); g_browser_process->local_state()->SetBoolean( metrics::prefs::kMetricsReportingEnabled, true); } -- -2.4.3 +2.6.2 diff --git a/patches/iridium-browser/first_run-deactivate-autoupdate-globally.patch b/patches/iridium-browser/first_run-deactivate-autoupdate-globally.patch index 579b05fe..59ed11fb 100644 --- a/patches/iridium-browser/first_run-deactivate-autoupdate-globally.patch +++ b/patches/iridium-browser/first_run-deactivate-autoupdate-globally.patch @@ -1,7 +1,7 @@ -From 29d7d8c8ddae7d697c283f56f505eacdf58a2ad8 Mon Sep 17 00:00:00 2001 +From d5daeb1000f6d32ec1df75e5d373f5c77c156694 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Sat, 13 Sep 2014 17:12:43 +0200 -Subject: [PATCH 27/56] first_run: deactivate autoupdate globally +Subject: [PATCH 26/57] 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 @@ -14,19 +14,19 @@ turn it back on. 1 file changed, 3 insertions(+) diff --git a/chrome/browser/extensions/extension_system_impl.cc b/chrome/browser/extensions/extension_system_impl.cc -index bbf1452..694d435 100644 +index 61b12fe..88d3a5f 100644 --- a/chrome/browser/extensions/extension_system_impl.cc +++ b/chrome/browser/extensions/extension_system_impl.cc -@@ -150,6 +150,9 @@ void ExtensionSystemImpl::Shared::Init(bool extensions_enabled) { +@@ -151,6 +151,9 @@ void ExtensionSystemImpl::Shared::Init(bool extensions_enabled) { bool autoupdate_enabled = !profile_->IsGuestSession() && !profile_->IsSystemProfile(); + if (autoupdate_enabled) -+ fprintf(stderr, "***ungoogled-chromium custom message*** autoupdate was enabled, overriding with false\n"); ++ fprintf(stderr, "*** autoupdate was enabled, overriding with false\n"); + autoupdate_enabled = false; #if defined(OS_CHROMEOS) if (!extensions_enabled) autoupdate_enabled = false; -- -2.4.3 +2.6.2 diff --git a/patches/iridium-browser/google-cloud-messaging-disable-experiment-status-che.patch b/patches/iridium-browser/google-cloud-messaging-disable-experiment-status-che.patch index d4b35343..2dec315b 100644 --- a/patches/iridium-browser/google-cloud-messaging-disable-experiment-status-che.patch +++ b/patches/iridium-browser/google-cloud-messaging-disable-experiment-status-che.patch @@ -1,7 +1,7 @@ -From 413a008b3122757013c1a7be9475183a53a9cd8d Mon Sep 17 00:00:00 2001 +From 7e3495487e05bb2f7ff3be3406a7196407d75b0d Mon Sep 17 00:00:00 2001 From: Joachim Bauch Date: Mon, 1 Jun 2015 17:14:34 +0200 -Subject: [PATCH 40/56] google-cloud-messaging: disable experiment status check +Subject: [PATCH 39/57] google-cloud-messaging: disable experiment status check This avoids trk:263 from triggering. --- @@ -42,5 +42,5 @@ index bafaee3..3167562 100644 void GCMChannelStatusRequest::OnURLFetchComplete( -- -2.4.3 +2.6.2 diff --git a/patches/iridium-browser/google_now-disable-this.patch b/patches/iridium-browser/google_now-disable-this.patch index 45a7a9b8..697d1173 100644 --- a/patches/iridium-browser/google_now-disable-this.patch +++ b/patches/iridium-browser/google_now-disable-this.patch @@ -1,7 +1,7 @@ -From 5aca8448909160fb218e9d74582a7ed650f4c064 Mon Sep 17 00:00:00 2001 +From a471b668d9b6df4dce5979e349c8221c88906149 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Fri, 19 Jun 2015 19:20:39 +0200 -Subject: [PATCH 50/56] google_now: disable this +Subject: [PATCH 49/57] google_now: disable this "Google Now is an intelligent personal assistant developed by Google. It is available within the Google Search mobile application for @@ -10,36 +10,36 @@ computers." (-WP) Get off my lawn! --- - build/common.gypi | 2 +- - build/config/features.gni | 2 +- + chrome/chrome_features.gyp | 2 +- + chrome/common/BUILD.gn | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) -diff --git a/build/common.gypi b/build/common.gypi -index 7c526c1..50b58ad 100644 ---- a/build/common.gypi -+++ b/build/common.gypi -@@ -539,7 +539,7 @@ - 'enable_extensions%': 1, - - # Enable Google Now. -- 'enable_google_now%': 1, -+ 'enable_google_now%': 0, - - # Enable basic printing support and UI. - 'enable_basic_printing%': 1, -diff --git a/build/config/features.gni b/build/config/features.gni -index 9a29d5e..13aa90f 100644 ---- a/build/config/features.gni -+++ b/build/config/features.gni -@@ -83,7 +83,7 @@ declare_args() { - - enable_autofill_dialog = !is_ios - -- enable_google_now = !is_ios && !is_android -+ enable_google_now = false - - enable_one_click_signin = is_win || is_mac || (is_linux && !is_chromeos) - +diff --git a/chrome/chrome_features.gyp b/chrome/chrome_features.gyp +index deb1b98..eee1680 100644 +--- a/chrome/chrome_features.gyp ++++ b/chrome/chrome_features.gyp +@@ -14,7 +14,7 @@ + 'variables': { + 'buildflag_header_path': 'chrome/common/features.h', + 'buildflag_flags': [ +- 'ENABLE_GOOGLE_NOW=<(enable_google_now)', ++ 'ENABLE_GOOGLE_NOW=0', + 'ANDROID_JAVA_UI=<(android_java_ui)', + 'USE_VULCANIZE=<(use_vulcanize)', + ], +diff --git a/chrome/common/BUILD.gn b/chrome/common/BUILD.gn +index 015ede6..6df46c6 100644 +--- a/chrome/common/BUILD.gn ++++ b/chrome/common/BUILD.gn +@@ -41,7 +41,7 @@ if (enable_extensions) { + buildflag_header("features") { + header = "features.h" + flags = [ +- "ENABLE_GOOGLE_NOW=$enable_google_now", ++ "ENABLE_GOOGLE_NOW=0", + "ANDROID_JAVA_UI=$android_java_ui", + "USE_VULCANIZE=$use_vulcanize", + ] -- -2.4.3 +2.6.2 diff --git a/patches/iridium-browser/hotword-disable-at-build-time-by-default.patch b/patches/iridium-browser/hotword-disable-at-build-time-by-default.patch index 7712b36f..e1ddede9 100644 --- a/patches/iridium-browser/hotword-disable-at-build-time-by-default.patch +++ b/patches/iridium-browser/hotword-disable-at-build-time-by-default.patch @@ -1,7 +1,7 @@ -From 7fe2903e71b37f8d238ca925b8c0827ebbbea1e3 Mon Sep 17 00:00:00 2001 +From 72c987ba14900f802df77a168d7f21643f400792 Mon Sep 17 00:00:00 2001 From: amistry Date: Tue, 9 Jun 2015 12:18:39 -0700 -Subject: [PATCH 49/56] hotword: disable at build time by default +Subject: [PATCH 48/57] hotword: disable at build time by default Commit f269d3b548203e217e8c0080c2e22e7ae3efb51e upstream: @@ -24,10 +24,10 @@ Hard-disable hotwording by default even on a build level. 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn -index ee23e48..91f92b5 100644 +index a66cec3..5840df3 100644 --- a/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn -@@ -24,7 +24,8 @@ declare_args() { +@@ -25,7 +25,8 @@ declare_args() { # 'Ok Google' hotwording is disabled by default. Set to true to enable. (This # will download a closed-source NaCl module at startup.) Chrome-branded # ChromeOS builds have this enabled by default. @@ -38,10 +38,10 @@ index ee23e48..91f92b5 100644 additional_modules_list_file = diff --git a/chrome/browser/extensions/component_loader.cc b/chrome/browser/extensions/component_loader.cc -index d4f347b..1e9b948 100644 +index c195f2f..dbfb29e 100644 --- a/chrome/browser/extensions/component_loader.cc +++ b/chrome/browser/extensions/component_loader.cc -@@ -359,17 +359,21 @@ void ComponentLoader::AddHangoutServicesExtension() { +@@ -358,17 +358,21 @@ void ComponentLoader::AddHangoutServicesExtension() { } void ComponentLoader::AddHotwordAudioVerificationApp() { @@ -64,10 +64,10 @@ index d4f347b..1e9b948 100644 void ComponentLoader::AddImageLoaderExtension() { diff --git a/chrome/browser/search/hotword_service_unittest.cc b/chrome/browser/search/hotword_service_unittest.cc -index c1571fb..e02ce43 100644 +index 315c85a..e97e618 100644 --- a/chrome/browser/search/hotword_service_unittest.cc +++ b/chrome/browser/search/hotword_service_unittest.cc -@@ -160,6 +160,7 @@ INSTANTIATE_TEST_CASE_P(HotwordServiceTests, +@@ -165,6 +165,7 @@ INSTANTIATE_TEST_CASE_P(HotwordServiceTests, // Disabled due to http://crbug.com/503963. TEST_P(HotwordServiceTest, DISABLED_IsHotwordAllowedLocale) { @@ -75,7 +75,7 @@ index c1571fb..e02ce43 100644 TestingProfile::Builder profile_builder; scoped_ptr profile = profile_builder.Build(); -@@ -201,6 +202,7 @@ TEST_P(HotwordServiceTest, DISABLED_IsHotwordAllowedLocale) { +@@ -206,6 +207,7 @@ TEST_P(HotwordServiceTest, DISABLED_IsHotwordAllowedLocale) { Profile* otr_profile = profile->GetOffTheRecordProfile(); SetApplicationLocale(otr_profile, "en"); EXPECT_FALSE(HotwordServiceFactory::IsHotwordAllowed(otr_profile)); @@ -83,7 +83,7 @@ index c1571fb..e02ce43 100644 } TEST_P(HotwordServiceTest, ShouldReinstallExtension) { -@@ -257,6 +259,7 @@ TEST_P(HotwordServiceTest, PreviousLanguageSetOnInstall) { +@@ -262,6 +264,7 @@ TEST_P(HotwordServiceTest, PreviousLanguageSetOnInstall) { } TEST_P(HotwordServiceTest, UninstallReinstallTriggeredCorrectly) { @@ -91,7 +91,7 @@ index c1571fb..e02ce43 100644 InitializeEmptyExtensionService(); service_->Init(); -@@ -337,6 +340,7 @@ TEST_P(HotwordServiceTest, UninstallReinstallTriggeredCorrectly) { +@@ -342,6 +345,7 @@ TEST_P(HotwordServiceTest, UninstallReinstallTriggeredCorrectly) { #endif EXPECT_FALSE(hotword_service->MaybeReinstallHotwordExtension()); EXPECT_EQ(1, hotword_service->uninstall_count()); // no change @@ -100,5 +100,5 @@ index c1571fb..e02ce43 100644 TEST_P(HotwordServiceTest, DisableAlwaysOnOnLanguageChange) { -- -2.4.3 +2.6.2 diff --git a/patches/iridium-browser/mime_util-force-text-x-suse-ymp-to-be-downloaded.patch b/patches/iridium-browser/mime_util-force-text-x-suse-ymp-to-be-downloaded.patch index f36ba5f9..ef10ea17 100644 --- a/patches/iridium-browser/mime_util-force-text-x-suse-ymp-to-be-downloaded.patch +++ b/patches/iridium-browser/mime_util-force-text-x-suse-ymp-to-be-downloaded.patch @@ -1,7 +1,7 @@ -From 8c79c634ec5c21a2d6f76d77b5dc6f72075c1c9c Mon Sep 17 00:00:00 2001 +From 1e3ee2091141bfad3d165fca0ce5daf6d74b1eea Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Thu, 29 Jan 2015 10:46:40 +0100 -Subject: [PATCH 08/56] mime_util: force text/x-suse-ymp to be downloaded +Subject: [PATCH 08/57] mime_util: force text/x-suse-ymp to be downloaded YMP files (YaST One Click Install) are plaintext XML, but also not very interesting in themselves. Force them to be stored. @@ -10,10 +10,10 @@ very interesting in themselves. Force them to be stored. 1 file changed, 1 insertion(+) diff --git a/components/mime_util/mime_util.cc b/components/mime_util/mime_util.cc -index fa7471b..c9b0d2b 100644 +index f7e59e4..592662f 100644 --- a/components/mime_util/mime_util.cc +++ b/components/mime_util/mime_util.cc -@@ -84,6 +84,7 @@ static const char* const kUnsupportedTextTypes[] = { +@@ -73,6 +73,7 @@ static const char* const kUnsupportedTextTypes[] = { "text/x-csv", "text/x-vcf", "text/rtf", @@ -22,5 +22,5 @@ index fa7471b..c9b0d2b 100644 "text/csv", "text/tab-separated-values", -- -2.4.3 +2.6.2 diff --git a/patches/iridium-browser/net-add-trk-scheme-and-help-identify-URLs-being-retr.patch b/patches/iridium-browser/net-add-trk-scheme-and-help-identify-URLs-being-retr.patch index bb98718f..ba70c043 100644 --- a/patches/iridium-browser/net-add-trk-scheme-and-help-identify-URLs-being-retr.patch +++ b/patches/iridium-browser/net-add-trk-scheme-and-help-identify-URLs-being-retr.patch @@ -1,7 +1,7 @@ -From fc752e717533de4a950648bf9e910dc0ac3d1657 Mon Sep 17 00:00:00 2001 +From 3e14f89724eeac18d4277ddf16fac2de6e60ecb6 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Wed, 20 May 2015 01:34:50 +0200 -Subject: [PATCH 41/56] net: add "trk:" scheme and help identify URLs being +Subject: [PATCH 40/57] net: add "trk:" scheme and help identify URLs being retrieved The Chromium codebase has left us with a number of suspect URLs, and @@ -35,21 +35,23 @@ stripped and processing continues with the inner URL. chrome/browser/ui/singleton_tabs.cc | 3 +- chrome/chrome_dll.gypi | 1 + chrome/chrome_exe.gypi | 1 + + components/infobars/core/infobar_delegate.h | 3 +- components/omnibox/browser/autocomplete_input.cc | 8 +-- content/browser/browser_url_handler_impl.cc | 20 ++++++++ .../browser/child_process_security_policy_impl.cc | 7 ++- iridium/iridium.gyp | 19 +++++++ - iridium/trkbar.cpp | 40 +++++++++++++++ - iridium/trkbar.h | 32 ++++++++++++ + iridium/trkbar.cpp | 45 +++++++++++++++++ + iridium/trkbar.h | 33 ++++++++++++ iridium/trknotify.cpp | 59 ++++++++++++++++++++++ iridium/trknotify.h | 20 ++++++++ net/url_request/url_request.cc | 7 +++ net/url_request/url_request.h | 2 + + tools/metrics/histograms/histograms.xml | 1 + url/gurl.cc | 35 +++++++++++++ url/gurl.h | 5 ++ url/url_constants.cc | 1 + url/url_constants.h | 1 + - 22 files changed, 287 insertions(+), 7 deletions(-) + 24 files changed, 296 insertions(+), 8 deletions(-) create mode 100644 iridium/iridium.gyp create mode 100644 iridium/trkbar.cpp create mode 100644 iridium/trkbar.h @@ -57,12 +59,12 @@ stripped and processing continues with the inner URL. create mode 100644 iridium/trknotify.h diff --git a/chrome/app/chrome_main.cc b/chrome/app/chrome_main.cc -index 360b7e5..5193c3a 100644 +index 041ecc4..92bc941 100644 --- a/chrome/app/chrome_main.cc +++ b/chrome/app/chrome_main.cc -@@ -5,6 +5,10 @@ - #include "chrome/app/chrome_main_delegate.h" +@@ -6,6 +6,10 @@ + #include "build/build_config.h" #include "content/public/app/content_main.h" +#if !defined(CHROME_MULTIPLE_DLL_CHILD) +# include "net/url_request/url_request.h" @@ -71,7 +73,7 @@ index 360b7e5..5193c3a 100644 #if defined(OS_WIN) #include "base/debug/dump_without_crashing.h" -@@ -25,6 +29,19 @@ int ChromeMain(int argc, const char** argv); +@@ -26,6 +30,19 @@ int ChromeMain(int argc, const char** argv); } #endif @@ -91,7 +93,7 @@ index 360b7e5..5193c3a 100644 #if defined(OS_WIN) DLLEXPORT int __cdecl ChromeMain(HINSTANCE instance, sandbox::SandboxInterfaceInfo* sandbox_info) { -@@ -63,6 +80,9 @@ int ChromeMain(int argc, const char** argv) { +@@ -64,6 +81,9 @@ int ChromeMain(int argc, const char** argv) { params.argv = argv; #endif @@ -114,10 +116,10 @@ index 61e5f32..b01574e 100644 base::LowerCaseEqualsASCII(scheme, url::kDataScheme))) { return metrics::OmniboxInputType::URL; diff --git a/chrome/browser/history/history_utils.cc b/chrome/browser/history/history_utils.cc -index 1bc5e8d..6e7210a 100644 +index 170f9f5..fbfb6e77 100644 --- a/chrome/browser/history/history_utils.cc +++ b/chrome/browser/history/history_utils.cc -@@ -19,6 +19,7 @@ bool CanAddURLToHistory(const GURL& url) { +@@ -20,6 +20,7 @@ bool CanAddURLToHistory(const GURL& url) { url.SchemeIs(content::kChromeDevToolsScheme) || url.SchemeIs(content::kChromeUIScheme) || url.SchemeIs(content::kViewSourceScheme) || @@ -126,10 +128,10 @@ index 1bc5e8d..6e7210a 100644 url.SchemeIs(chrome::kChromeSearchScheme) || url.SchemeIs(dom_distiller::kDomDistillerScheme)) diff --git a/chrome/browser/ui/browser_command_controller.cc b/chrome/browser/ui/browser_command_controller.cc -index 395cdc9..ba793c7 100644 +index 06497a7..603aecf 100644 --- a/chrome/browser/ui/browser_command_controller.cc +++ b/chrome/browser/ui/browser_command_controller.cc -@@ -105,7 +105,8 @@ bool HasInternalURL(const NavigationEntry* entry) { +@@ -110,7 +110,8 @@ bool HasInternalURL(const NavigationEntry* entry) { // If the |virtual_url()| isn't a chrome:// URL, check if it's actually // view-source: of a chrome:// URL. @@ -140,10 +142,10 @@ index 395cdc9..ba793c7 100644 return false; diff --git a/chrome/browser/ui/browser_navigator.cc b/chrome/browser/ui/browser_navigator.cc -index d5573b1..65baf5c 100644 +index 1663617..e8044f2 100644 --- a/chrome/browser/ui/browser_navigator.cc +++ b/chrome/browser/ui/browser_navigator.cc -@@ -624,6 +624,14 @@ bool IsURLAllowedInIncognito(const GURL& url, +@@ -619,6 +619,14 @@ bool IsURLAllowedInIncognito(const GURL& url, return stripped_url.is_valid() && IsURLAllowedInIncognito(stripped_url, browser_context); } @@ -173,10 +175,10 @@ index 870e8df..bdea535 100644 GURL rewritten_tab_url = tab_url; diff --git a/chrome/chrome_dll.gypi b/chrome/chrome_dll.gypi -index d246635..c8007cf 100644 +index a0aa2c1..a8047f1 100644 --- a/chrome/chrome_dll.gypi +++ b/chrome/chrome_dll.gypi -@@ -122,6 +122,7 @@ +@@ -120,6 +120,7 @@ 'app/delay_load_hook_win.h', ], 'dependencies': [ @@ -185,10 +187,10 @@ index d246635..c8007cf 100644 '../content/content.gyp:content_app_browser', ], diff --git a/chrome/chrome_exe.gypi b/chrome/chrome_exe.gypi -index 6865227..8ed0547 100644 +index f36491b..c9bc7a8 100644 --- a/chrome/chrome_exe.gypi +++ b/chrome/chrome_exe.gypi -@@ -197,6 +197,7 @@ +@@ -203,6 +203,7 @@ 'app/chrome_main_delegate.h', ], 'dependencies': [ @@ -196,11 +198,25 @@ index 6865227..8ed0547 100644 # On Linux, link the dependencies (libraries) that make up actual # Chromium functionality directly into the executable. '<@(chromium_browser_dependencies)', +diff --git a/components/infobars/core/infobar_delegate.h b/components/infobars/core/infobar_delegate.h +index 1a9931b..c80e242 100644 +--- a/components/infobars/core/infobar_delegate.h ++++ b/components/infobars/core/infobar_delegate.h +@@ -124,7 +124,8 @@ class InfoBarDelegate { + SHOW_PASSKIT_INFOBAR_ERROR_DELEGATE = 56, + READER_MODE_INFOBAR_DELEGATE = 57, + SYNC_ERROR_INFOBAR_DELEGATE = 58, +- UPGRADE_INFOBAR_DELEGATE = 59 ++ UPGRADE_INFOBAR_DELEGATE = 59, ++ TRACKING_ALERT_INFOBAR_DELEGATE = 60, + }; + + // Describes navigation events, used to decide whether infobars should be diff --git a/components/omnibox/browser/autocomplete_input.cc b/components/omnibox/browser/autocomplete_input.cc -index d5e10f5b..c2b6f68 100644 +index 57a43a1..f529d85 100644 --- a/components/omnibox/browser/autocomplete_input.cc +++ b/components/omnibox/browser/autocomplete_input.cc -@@ -472,7 +472,8 @@ void AutocompleteInput::ParseForEmphasizeComponents( +@@ -473,7 +473,8 @@ void AutocompleteInput::ParseForEmphasizeComponents( int after_scheme_and_colon = parts.scheme.end() + 1; // For the view-source scheme, we should emphasize the scheme and host of the // URL qualified by the view-source prefix. @@ -210,7 +226,7 @@ index d5e10f5b..c2b6f68 100644 (static_cast(text.length()) > after_scheme_and_colon)) { // Obtain the URL prefixed by view-source and parse it. base::string16 real_url(text.substr(after_scheme_and_colon)); -@@ -539,9 +540,10 @@ int AutocompleteInput::NumNonHostComponents(const url::Parsed& parts) { +@@ -540,9 +541,10 @@ int AutocompleteInput::NumNonHostComponents(const url::Parsed& parts) { bool AutocompleteInput::HasHTTPScheme(const base::string16& input) { std::string utf8_input(base::UTF16ToUTF8(input)); url::Component scheme; @@ -224,10 +240,10 @@ index d5e10f5b..c2b6f68 100644 } diff --git a/content/browser/browser_url_handler_impl.cc b/content/browser/browser_url_handler_impl.cc -index 4f1ed35..31b0cbd 100644 +index a79b89d..ab808cc 100644 --- a/content/browser/browser_url_handler_impl.cc +++ b/content/browser/browser_url_handler_impl.cc -@@ -10,9 +10,28 @@ +@@ -13,9 +13,28 @@ #include "content/public/browser/content_browser_client.h" #include "content/public/common/url_constants.h" #include "url/gurl.h" @@ -256,7 +272,7 @@ index 4f1ed35..31b0cbd 100644 // Handles rewriting view-source URLs for what we'll actually load. static bool HandleViewSource(GURL* url, BrowserContext* browser_context) { if (url->SchemeIs(kViewSourceScheme)) { -@@ -96,6 +115,7 @@ BrowserURLHandlerImpl::BrowserURLHandlerImpl() : +@@ -99,6 +118,7 @@ BrowserURLHandlerImpl::BrowserURLHandlerImpl() : // view-source: AddHandlerPair(&HandleViewSource, &ReverseViewSource); @@ -265,10 +281,10 @@ index 4f1ed35..31b0cbd 100644 BrowserURLHandlerImpl::~BrowserURLHandlerImpl() { diff --git a/content/browser/child_process_security_policy_impl.cc b/content/browser/child_process_security_policy_impl.cc -index 9e94f34..a8f1916 100644 +index 639401f..93ec7e3 100644 --- a/content/browser/child_process_security_policy_impl.cc +++ b/content/browser/child_process_security_policy_impl.cc -@@ -306,6 +306,7 @@ ChildProcessSecurityPolicyImpl::ChildProcessSecurityPolicyImpl() { +@@ -308,6 +308,7 @@ ChildProcessSecurityPolicyImpl::ChildProcessSecurityPolicyImpl() { RegisterPseudoScheme(url::kAboutScheme); RegisterPseudoScheme(url::kJavaScriptScheme); RegisterPseudoScheme(kViewSourceScheme); @@ -276,7 +292,7 @@ index 9e94f34..a8f1916 100644 } ChildProcessSecurityPolicyImpl::~ChildProcessSecurityPolicyImpl() { -@@ -394,7 +395,7 @@ void ChildProcessSecurityPolicyImpl::GrantRequestURL( +@@ -396,7 +397,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. @@ -285,7 +301,7 @@ index 9e94f34..a8f1916 100644 // URLs with the view-source scheme typically look like: // view-source:http://www.9oo91e.qjz9zk/a // In order to request these URLs, the child_id needs to be able to -@@ -586,13 +587,15 @@ bool ChildProcessSecurityPolicyImpl::CanRequestURL( +@@ -588,13 +589,15 @@ bool ChildProcessSecurityPolicyImpl::CanRequestURL( if (IsPseudoScheme(url.scheme())) { // There are a number of special cases for pseudo schemes. @@ -329,10 +345,10 @@ index 0000000..a1fee8f +} diff --git a/iridium/trkbar.cpp b/iridium/trkbar.cpp new file mode 100644 -index 0000000..bf0139c +index 0000000..4935263 --- /dev/null +++ b/iridium/trkbar.cpp -@@ -0,0 +1,40 @@ +@@ -0,0 +1,45 @@ +/* + * Copyright 2015 The Iridium Authors + * @@ -372,13 +388,18 @@ index 0000000..bf0139c + return BUTTON_NONE; +} + ++infobars::InfoBarDelegate::InfoBarIdentifier TrkBar::GetIdentifier(void) const ++{ ++ return TRACKING_ALERT_INFOBAR_DELEGATE; ++} ++ +}; /* namespace content */ diff --git a/iridium/trkbar.h b/iridium/trkbar.h new file mode 100644 -index 0000000..ade2eb7 +index 0000000..b251fec --- /dev/null +++ b/iridium/trkbar.h -@@ -0,0 +1,32 @@ +@@ -0,0 +1,33 @@ +/* + * Copyright 2015 The Iridium Authors. + * @@ -403,6 +424,7 @@ index 0000000..ade2eb7 + TrkBar(const GURL &); + base::string16 GetMessageText(void) const override; + int GetButtons(void) const override; ++ infobars::InfoBarDelegate::InfoBarIdentifier GetIdentifier(void) const override; + + GURL m_url; + DISALLOW_COPY_AND_ASSIGN(TrkBar); @@ -503,10 +525,10 @@ index 0000000..3c58d22 + +#endif /* IRIDIUM_TRKNOTIFY_H */ diff --git a/net/url_request/url_request.cc b/net/url_request/url_request.cc -index 03f3f02..ac61270 100644 +index 7bd01e0..83cb040 100644 --- a/net/url_request/url_request.cc +++ b/net/url_request/url_request.cc -@@ -45,6 +45,8 @@ using std::string; +@@ -50,6 +50,8 @@ using std::string; namespace net { @@ -515,7 +537,7 @@ index 03f3f02..ac61270 100644 namespace { // Max number of http redirects to follow. Same number as gecko. -@@ -565,6 +567,11 @@ URLRequest::URLRequest(const GURL& url, +@@ -585,6 +587,11 @@ URLRequest::URLRequest(const GURL& url, DCHECK(base::MessageLoop::current()) << "The current base::MessageLoop must exist"; @@ -528,10 +550,10 @@ index 03f3f02..ac61270 100644 net_log_.BeginEvent(NetLog::TYPE_REQUEST_ALIVE); } diff --git a/net/url_request/url_request.h b/net/url_request/url_request.h -index 9209697..37e9d6b 100644 +index 1a17470..cb7337e 100644 --- a/net/url_request/url_request.h +++ b/net/url_request/url_request.h -@@ -858,6 +858,8 @@ class NET_EXPORT URLRequest : NON_EXPORTED_BASE(public base::NonThreadSafe), +@@ -888,6 +888,8 @@ class NET_EXPORT URLRequest : NON_EXPORTED_BASE(public base::NonThreadSafe), DISALLOW_COPY_AND_ASSIGN(URLRequest); }; @@ -540,11 +562,23 @@ index 9209697..37e9d6b 100644 } // namespace net #endif // NET_URL_REQUEST_URL_REQUEST_H_ +diff --git a/tools/metrics/histograms/histograms.xml b/tools/metrics/histograms/histograms.xml +index f5c2eeb..2a3e53f 100644 +--- a/tools/metrics/histograms/histograms.xml ++++ b/tools/metrics/histograms/histograms.xml +@@ -67890,6 +67890,7 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries. + + + ++ + + + diff --git a/url/gurl.cc b/url/gurl.cc -index e2ca9d7..8b78c89 100644 +index b75bb4f..fc3386f 100644 --- a/url/gurl.cc +++ b/url/gurl.cc -@@ -534,6 +534,41 @@ void GURL::Swap(GURL* other) { +@@ -536,6 +536,41 @@ void GURL::Swap(GURL* other) { inner_url_.swap(other->inner_url_); } @@ -587,10 +621,10 @@ index e2ca9d7..8b78c89 100644 return out << url.possibly_invalid_spec(); } diff --git a/url/gurl.h b/url/gurl.h -index 8c274ea..14ff966 100644 +index b49d2fd..b59a423 100644 --- a/url/gurl.h +++ b/url/gurl.h -@@ -393,6 +393,9 @@ class URL_EXPORT GURL { +@@ -395,6 +395,9 @@ class URL_EXPORT GURL { return inner_url_.get(); } @@ -600,7 +634,7 @@ index 8c274ea..14ff966 100644 private: // Variant of the string parsing constructor that allows the caller to elect // retain trailing whitespace, if any, on the passed URL spec, but only if -@@ -436,5 +439,7 @@ class URL_EXPORT GURL { +@@ -438,5 +441,7 @@ class URL_EXPORT GURL { // Stream operator so GURL can be used in assertion statements. URL_EXPORT std::ostream& operator<<(std::ostream& out, const GURL& url); @@ -633,5 +667,5 @@ index c48dafc..18770d0 100644 URL_EXPORT extern const char kWssScheme[]; -- -2.4.3 +2.6.2 diff --git a/patches/iridium-browser/net-cert-increase-default-key-length-for-newly-gener.patch b/patches/iridium-browser/net-cert-increase-default-key-length-for-newly-gener.patch index 3070182b..e1bc910c 100644 --- a/patches/iridium-browser/net-cert-increase-default-key-length-for-newly-gener.patch +++ b/patches/iridium-browser/net-cert-increase-default-key-length-for-newly-gener.patch @@ -1,7 +1,7 @@ -From ea69cb91617eb5c3661fcfbea941e20a0b872df8 Mon Sep 17 00:00:00 2001 +From 6f7882ce4ef8f62a5cadcd40e072d4253595f237 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Mon, 15 Sep 2014 10:52:32 +0200 -Subject: [PATCH 01/56] net/cert: increase default key length for +Subject: [PATCH 01/57] net/cert: increase default key length for newly-generated RSA keys Should we add something for chrome://settings, or just leave @@ -24,5 +24,5 @@ index bbdc194..eff3b51 100644 // Certificates made by CreateKeyAndSelfSignedCert and // CreateKeyAndChannelIDEC will be signed using this digest algorithm. -- -2.4.3 +2.6.2 diff --git a/patches/iridium-browser/plugin-do-not-load-any-system-provided-plugins-on-Wi.patch b/patches/iridium-browser/plugin-do-not-load-any-system-provided-plugins-on-Wi.patch index cea2a9ff..52440b6e 100644 --- a/patches/iridium-browser/plugin-do-not-load-any-system-provided-plugins-on-Wi.patch +++ b/patches/iridium-browser/plugin-do-not-load-any-system-provided-plugins-on-Wi.patch @@ -1,7 +1,7 @@ -From 19d7afc46d4f0b49721b7e119d2bf7e5867d7227 Mon Sep 17 00:00:00 2001 +From 93350ce4bac40a717803b0d61133197fe7f3cf75 Mon Sep 17 00:00:00 2001 From: Joachim Bauch Date: Wed, 15 Apr 2015 15:19:21 +0200 -Subject: [PATCH 34/56] plugin: do not load any system-provided plugins on +Subject: [PATCH 33/57] plugin: do not load any system-provided plugins on Windows --- @@ -9,10 +9,10 @@ Subject: [PATCH 34/56] plugin: do not load any system-provided plugins on 1 file changed, 4 insertions(+) diff --git a/content/common/plugin_list_win.cc b/content/common/plugin_list_win.cc -index 4b20953..fc40e1e 100644 +index e96cc05..17fce0d 100644 --- a/content/common/plugin_list_win.cc +++ b/content/common/plugin_list_win.cc -@@ -316,6 +316,7 @@ void PluginList::GetPluginDirectories( +@@ -318,6 +318,7 @@ void PluginList::GetPluginDirectories( // Load from the executable area GetExeDirectory(&dirs); @@ -20,7 +20,7 @@ index 4b20953..fc40e1e 100644 // Load Java GetJavaDirectory(&dirs); -@@ -328,6 +329,7 @@ void PluginList::GetPluginDirectories( +@@ -330,6 +331,7 @@ void PluginList::GetPluginDirectories( GetAcrobatDirectory(&dirs); GetQuicktimeDirectory(&dirs); GetWindowsMediaDirectory(&dirs); @@ -28,7 +28,7 @@ index 4b20953..fc40e1e 100644 for (std::set::iterator i = dirs.begin(); i != dirs.end(); ++i) plugin_dirs->push_back(*i); -@@ -364,6 +366,7 @@ void PluginList::GetPluginPathsFromRegistry( +@@ -366,6 +368,7 @@ void PluginList::GetPluginPathsFromRegistry( std::set plugin_dirs; @@ -36,7 +36,7 @@ index 4b20953..fc40e1e 100644 // Search for plugins from HKCU and HKLM. THis will only find plugins that // are correctly registered in the correct WOW64 registry hive. GetPluginsInRegistryDirectory(HKEY_CURRENT_USER, -@@ -374,6 +377,7 @@ void PluginList::GetPluginPathsFromRegistry( +@@ -376,6 +379,7 @@ void PluginList::GetPluginPathsFromRegistry( kRegistryMozillaPlugins, 0, &plugin_dirs); @@ -45,5 +45,5 @@ index 4b20953..fc40e1e 100644 for (std::set::iterator i = plugin_dirs.begin(); i != plugin_dirs.end(); ++i) { -- -2.4.3 +2.6.2 diff --git a/patches/iridium-browser/plugin-only-load-plugins-from-user-s-domain-on-Mac-O.patch b/patches/iridium-browser/plugin-only-load-plugins-from-user-s-domain-on-Mac-O.patch index 2bb60801..4885362a 100644 --- a/patches/iridium-browser/plugin-only-load-plugins-from-user-s-domain-on-Mac-O.patch +++ b/patches/iridium-browser/plugin-only-load-plugins-from-user-s-domain-on-Mac-O.patch @@ -1,7 +1,7 @@ -From 61d1719485eaa74cad5ba9d73e0a25fa288f54f0 Mon Sep 17 00:00:00 2001 +From b33dbc4db45a46ebcf3011f2b964ad18a2afe11e Mon Sep 17 00:00:00 2001 From: Ivan Sein Date: Wed, 25 Mar 2015 17:00:59 +0100 -Subject: [PATCH 35/56] plugin: only load plugins from user's domain on Mac OS +Subject: [PATCH 34/57] plugin: only load plugins from user's domain on Mac OS This patch prevents Iridium from loading plugins that are already installed on your machine (/Library/Internet Plug-Ins). @@ -26,5 +26,5 @@ index b3d726c..6fa826c 100644 void PluginList::GetPluginsInDir( -- -2.4.3 +2.6.2 diff --git a/patches/iridium-browser/prefs-always-prompt-for-download-directory-by-defaul.patch b/patches/iridium-browser/prefs-always-prompt-for-download-directory-by-defaul.patch index 8fb4fcd5..9602115f 100644 --- a/patches/iridium-browser/prefs-always-prompt-for-download-directory-by-defaul.patch +++ b/patches/iridium-browser/prefs-always-prompt-for-download-directory-by-defaul.patch @@ -1,7 +1,7 @@ -From 154892fb970b8e2a40dbb645822f5fa4533e9a30 Mon Sep 17 00:00:00 2001 +From 73691fd23fb2b9651450fa2a33f10caa03748d55 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Fri, 13 Feb 2015 01:04:21 +0100 -Subject: [PATCH 21/56] prefs: always prompt for download directory by default +Subject: [PATCH 20/57] prefs: always prompt for download directory by default If the user opens a link, one of two things might happen. The URI resolves to a "web page" and will be displayed, then everything is @@ -28,10 +28,10 @@ TLDR: Do not let files sneak onto the disk too easily. 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chrome/browser/download/download_prefs.cc b/chrome/browser/download/download_prefs.cc -index f6a3209..3c53280 100644 +index 6f2daef..95b5a69 100644 --- a/chrome/browser/download/download_prefs.cc +++ b/chrome/browser/download/download_prefs.cc -@@ -196,7 +196,7 @@ void DownloadPrefs::RegisterProfilePrefs( +@@ -200,7 +200,7 @@ void DownloadPrefs::RegisterProfilePrefs( user_prefs::PrefRegistrySyncable* registry) { registry->RegisterBooleanPref( prefs::kPromptForDownload, @@ -41,5 +41,5 @@ index f6a3209..3c53280 100644 registry->RegisterStringPref(prefs::kDownloadExtensionsToOpen, std::string()); registry->RegisterBooleanPref(prefs::kDownloadDirUpgraded, false); -- -2.4.3 +2.6.2 diff --git a/patches/iridium-browser/prefs-block-third-party-cookies-by-default.patch b/patches/iridium-browser/prefs-block-third-party-cookies-by-default.patch index a693a763..3f770bd1 100644 --- a/patches/iridium-browser/prefs-block-third-party-cookies-by-default.patch +++ b/patches/iridium-browser/prefs-block-third-party-cookies-by-default.patch @@ -1,7 +1,7 @@ -From 24b03184991fc65594739fa88ae262aad5a99072 Mon Sep 17 00:00:00 2001 +From 8053e231b200fb7c000a3acb3d5b3d73c418c39a Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Sat, 13 Sep 2014 16:43:55 +0200 -Subject: [PATCH 15/56] prefs: block third-party cookies by default +Subject: [PATCH 14/57] 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 @@ -11,7 +11,7 @@ some, static exceptions can be defined. 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 73ba6f6..3d10e98 100644 +index 7225477..87285d0 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( @@ -24,5 +24,5 @@ index 73ba6f6..3d10e98 100644 } -- -2.4.3 +2.6.2 diff --git a/patches/iridium-browser/prefs-disable-Use-a-prediction-service-to-help-compl.patch b/patches/iridium-browser/prefs-disable-Use-a-prediction-service-to-help-compl.patch index 12cb20db..31f65fbe 100644 --- a/patches/iridium-browser/prefs-disable-Use-a-prediction-service-to-help-compl.patch +++ b/patches/iridium-browser/prefs-disable-Use-a-prediction-service-to-help-compl.patch @@ -1,7 +1,7 @@ -From 6b3a3eaa1281feb304635b87273216a6f7e3daf9 Mon Sep 17 00:00:00 2001 +From 3fa4f351528aa95f356310b0de5d2ff605b2e4f7 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Sat, 13 Sep 2014 15:06:39 +0200 -Subject: [PATCH 12/56] prefs: disable "Use a prediction service to help +Subject: [PATCH 11/57] prefs: disable "Use a prediction service to help complete searches..." This autocomplete service would send search queries as soon as you @@ -16,18 +16,18 @@ Set suggest_enabled to false by default. 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chrome/browser/profiles/profile.cc b/chrome/browser/profiles/profile.cc -index 190bb2c..52eb89a 100644 +index 0766655..44dcee5 100644 --- a/chrome/browser/profiles/profile.cc +++ b/chrome/browser/profiles/profile.cc -@@ -76,7 +76,7 @@ const char Profile::kNoHostedDomainFound[] = "NO_HOSTED_DOMAIN"; +@@ -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 defined(OS_ANDROID) + #if BUILDFLAG(ANDROID_JAVA_UI) registry->RegisterStringPref( -- -2.4.3 +2.6.2 diff --git a/patches/iridium-browser/prefs-disable-Use-a-web-service-to-help-resolve-navi.patch b/patches/iridium-browser/prefs-disable-Use-a-web-service-to-help-resolve-navi.patch index 4de62a72..e73fba27 100644 --- a/patches/iridium-browser/prefs-disable-Use-a-web-service-to-help-resolve-navi.patch +++ b/patches/iridium-browser/prefs-disable-Use-a-web-service-to-help-resolve-navi.patch @@ -1,7 +1,7 @@ -From 1fff8e3b43b6645945abfa88d5bd003b976a8c48 Mon Sep 17 00:00:00 2001 +From d4b3fec6c4c5154b76ca25fce9e87087d3f5ceb9 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Thu, 11 Sep 2014 16:35:12 +0200 -Subject: [PATCH 11/56] prefs: disable "Use a web service to help resolve +Subject: [PATCH 10/57] prefs: disable "Use a web service to help resolve navigation errors" This goes towards reducing promiscuous outbound requests to @@ -14,7 +14,7 @@ Set alternate_error_pages to be disabled by default. 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 6be6a9f..6acc08d 100644 +index a943d40..e6b11b4 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() { @@ -27,5 +27,5 @@ index 6be6a9f..6acc08d 100644 } -- -2.4.3 +2.6.2 diff --git a/patches/iridium-browser/prefs-disable-background-mode-by-default.patch b/patches/iridium-browser/prefs-disable-background-mode-by-default.patch index 8deac232..9b778d12 100644 --- a/patches/iridium-browser/prefs-disable-background-mode-by-default.patch +++ b/patches/iridium-browser/prefs-disable-background-mode-by-default.patch @@ -1,7 +1,7 @@ -From 627762c2c770fc9eca5a4169a1af5560eef43ad3 Mon Sep 17 00:00:00 2001 +From eb14cdf0766851177918c0ea4912a6f58b2d30dc Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Sat, 13 Sep 2014 16:59:10 +0200 -Subject: [PATCH 17/56] prefs: disable background mode by default +Subject: [PATCH 16/57] 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. @@ -10,10 +10,10 @@ do not linger around, do not possibly collect data somewhere. 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 5bd2c6c..465fe13 100644 +index 09d4afb..a1cbaa9 100644 --- a/chrome/browser/background/background_mode_manager.cc +++ b/chrome/browser/background/background_mode_manager.cc -@@ -349,7 +349,7 @@ void BackgroundModeManager::RegisterPrefs(PrefRegistrySimple* registry) { +@@ -356,7 +356,7 @@ void BackgroundModeManager::RegisterPrefs(PrefRegistrySimple* registry) { registry->RegisterBooleanPref(prefs::kChromeCreatedLoginItem, false); registry->RegisterBooleanPref(prefs::kMigratedLoginItemPref, false); #endif @@ -23,5 +23,5 @@ index 5bd2c6c..465fe13 100644 void BackgroundModeManager::RegisterProfile(Profile* profile) { -- -2.4.3 +2.6.2 diff --git a/patches/iridium-browser/prefs-disable-hyperlink-auditing.patch b/patches/iridium-browser/prefs-disable-hyperlink-auditing.patch index 6ee0a7c5..eb2a0b0d 100644 --- a/patches/iridium-browser/prefs-disable-hyperlink-auditing.patch +++ b/patches/iridium-browser/prefs-disable-hyperlink-auditing.patch @@ -1,7 +1,7 @@ -From ada5082c5f81be6eb44d4219e70a11a05dbd5eea Mon Sep 17 00:00:00 2001 +From 318b8f9c0041c85b2223e95da0d01524971f09f9 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Sat, 13 Sep 2014 17:03:17 +0200 -Subject: [PATCH 18/56] prefs: disable hyperlink auditing +Subject: [PATCH 17/57] prefs: disable hyperlink auditing "Disable sending hyperlink auditing pings", i.e. pings to URLs in when clicked. @@ -15,10 +15,10 @@ https://html.spec.whatwg.org/multipage/semantics.html#hyperlink-auditing . 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 e0a26c8..d7d7e07 100644 +index 21f7f95..fe978fa 100644 --- a/chrome/browser/chrome_content_browser_client.cc +++ b/chrome/browser/chrome_content_browser_client.cc -@@ -688,7 +688,7 @@ ChromeContentBrowserClient::~ChromeContentBrowserClient() { +@@ -733,7 +733,7 @@ ChromeContentBrowserClient::~ChromeContentBrowserClient() { void ChromeContentBrowserClient::RegisterProfilePrefs( user_prefs::PrefRegistrySyncable* registry) { registry->RegisterBooleanPref(prefs::kDisable3DAPIs, false); @@ -28,5 +28,5 @@ index e0a26c8..d7d7e07 100644 } -- -2.4.3 +2.6.2 diff --git a/patches/iridium-browser/prefs-disable-network-DNS-prediction.patch b/patches/iridium-browser/prefs-disable-network-DNS-prediction.patch index 415bdad3..4baa2093 100644 --- a/patches/iridium-browser/prefs-disable-network-DNS-prediction.patch +++ b/patches/iridium-browser/prefs-disable-network-DNS-prediction.patch @@ -1,7 +1,7 @@ -From de96c208f8a9a457798d2a309379fcae91e34838 Mon Sep 17 00:00:00 2001 +From e8a818f62e5c1a13a77280580c0ef0184f79ed08 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Sat, 13 Sep 2014 15:20:11 +0200 -Subject: [PATCH 14/56] prefs: disable network/DNS prediction +Subject: [PATCH 13/57] prefs: disable network/DNS prediction Stop wasting my bandwidth (however little), and also don't tell others what I am about to visit. @@ -25,20 +25,20 @@ index fc8b585..bf8b350 100644 /** * @return The number of choices offered for the user. diff --git a/chrome/browser/net/prediction_options.cc b/chrome/browser/net/prediction_options.cc -index 40abb5a..511435b 100644 +index 4533c93..964946a 100644 --- a/chrome/browser/net/prediction_options.cc +++ b/chrome/browser/net/prediction_options.cc -@@ -25,7 +25,7 @@ bool CanPrefetchAndPrerender(int network_prediction_options) { +@@ -26,7 +26,7 @@ NetworkPredictionStatus CanPrefetchAndPrerender( case NETWORK_PREDICTION_NEVER: - return false; + return NetworkPredictionStatus::DISABLED_ALWAYS; default: - DCHECK_EQ(NETWORK_PREDICTION_WIFI_ONLY, network_prediction_options); -+ //DCHECK_EQ(NETWORK_PREDICTION_WIFI_ONLY, network_prediction_options); - return !net::NetworkChangeNotifier::IsConnectionCellular( - net::NetworkChangeNotifier::GetConnectionType()); - } ++// DCHECK_EQ(NETWORK_PREDICTION_WIFI_ONLY, network_prediction_options); + if (net::NetworkChangeNotifier::IsConnectionCellular( + net::NetworkChangeNotifier::GetConnectionType())) { + return NetworkPredictionStatus::DISABLED_DUE_TO_NETWORK; diff --git a/chrome/browser/net/prediction_options.h b/chrome/browser/net/prediction_options.h -index 6a2f8df..2edb2cd 100644 +index 9029157..bafeefc 100644 --- a/chrome/browser/net/prediction_options.h +++ b/chrome/browser/net/prediction_options.h @@ -21,7 +21,7 @@ enum NetworkPredictionOptions { @@ -49,7 +49,7 @@ index 6a2f8df..2edb2cd 100644 + NETWORK_PREDICTION_DEFAULT = NETWORK_PREDICTION_NEVER, }; - void RegisterPredictionOptionsProfilePrefs( + enum class NetworkPredictionStatus { -- -2.4.3 +2.6.2 diff --git a/patches/iridium-browser/prefs-disable-translation-service.patch b/patches/iridium-browser/prefs-disable-translation-service.patch index 4b62d7b8..2af63ae5 100644 --- a/patches/iridium-browser/prefs-disable-translation-service.patch +++ b/patches/iridium-browser/prefs-disable-translation-service.patch @@ -1,7 +1,7 @@ -From 95ffd1d9f9e484b50ff8ffba898d9ee303573ae5 Mon Sep 17 00:00:00 2001 +From 3cb57f719136a075d45d2f2245a3509f28b23604 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Thu, 30 Oct 2014 22:04:24 +0100 -Subject: [PATCH 25/56] prefs: disable translation service +Subject: [PATCH 24/57] prefs: disable translation service When translation is enabled, the translation manager will request a list of supported languages from translate.9oo91eapis.qjz9zk. @@ -13,10 +13,10 @@ instead to request translations via Google. 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 c4b2204..fa40ad3 100644 +index 50cae0d..61a0463 100644 --- a/chrome/browser/ui/browser_ui_prefs.cc +++ b/chrome/browser/ui/browser_ui_prefs.cc -@@ -93,7 +93,7 @@ void RegisterBrowserUserPrefs(user_prefs::PrefRegistrySyncable* registry) { +@@ -83,7 +83,7 @@ void RegisterBrowserUserPrefs(user_prefs::PrefRegistrySyncable* registry) { registry->RegisterBooleanPref(prefs::kWebAppCreateInQuickLaunchBar, true); registry->RegisterBooleanPref( prefs::kEnableTranslate, @@ -26,5 +26,5 @@ index c4b2204..fa40ad3 100644 registry->RegisterStringPref(prefs::kCloudPrintEmail, std::string()); registry->RegisterBooleanPref(prefs::kCloudPrintProxyEnabled, true); -- -2.4.3 +2.6.2 diff --git a/patches/iridium-browser/prefs-do-not-store-passwords-by-default.patch b/patches/iridium-browser/prefs-do-not-store-passwords-by-default.patch index 6c1c3efe..b3fbe17d 100644 --- a/patches/iridium-browser/prefs-do-not-store-passwords-by-default.patch +++ b/patches/iridium-browser/prefs-do-not-store-passwords-by-default.patch @@ -1,17 +1,17 @@ -From 2bfa7c48be5796fedf0a0beb44be37283791981d Mon Sep 17 00:00:00 2001 +From b3b1b761e24b3489ed058d0c11cb1bc4fc7d2c94 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Sat, 13 Sep 2014 17:06:40 +0200 -Subject: [PATCH 19/56] prefs: do not store passwords by default +Subject: [PATCH 18/57] prefs: do not store passwords by default --- components/password_manager/core/browser/password_manager.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/password_manager/core/browser/password_manager.cc b/components/password_manager/core/browser/password_manager.cc -index 59cbf96..67b1fbb 100644 +index 4deb126..e0ed547 100644 --- a/components/password_manager/core/browser/password_manager.cc +++ b/components/password_manager/core/browser/password_manager.cc -@@ -148,7 +148,7 @@ void PasswordManager::RegisterProfilePrefs( +@@ -153,7 +153,7 @@ void PasswordManager::RegisterProfilePrefs( user_prefs::PrefRegistrySyncable* registry) { registry->RegisterBooleanPref( prefs::kPasswordManagerSavingEnabled, @@ -21,5 +21,5 @@ index 59cbf96..67b1fbb 100644 registry->RegisterBooleanPref( prefs::kCredentialsEnableService, true, -- -2.4.3 +2.6.2 diff --git a/patches/iridium-browser/prefs-only-keep-cookies-until-exit.patch b/patches/iridium-browser/prefs-only-keep-cookies-until-exit.patch index 3272e4bf..cfb9a78e 100644 --- a/patches/iridium-browser/prefs-only-keep-cookies-until-exit.patch +++ b/patches/iridium-browser/prefs-only-keep-cookies-until-exit.patch @@ -1,7 +1,7 @@ -From 074508abde1c3a0bc9480272ccba34270bbfe393 Mon Sep 17 00:00:00 2001 +From 50c1dba136c74964ac230efa33b81bb474f285e9 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Sat, 13 Sep 2014 17:25:47 +0200 -Subject: [PATCH 20/56] prefs: only keep cookies until exit +Subject: [PATCH 19/57] prefs: only keep cookies until exit Out with all those tracking cookies! --- @@ -9,10 +9,10 @@ Out with all those tracking cookies! 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/content_settings/core/browser/content_settings_registry.cc b/components/content_settings/core/browser/content_settings_registry.cc -index cfc4f65..7504eba 100644 +index 34510e3..fcaae64 100644 --- a/components/content_settings/core/browser/content_settings_registry.cc +++ b/components/content_settings/core/browser/content_settings_registry.cc -@@ -113,7 +113,7 @@ void ContentSettingsRegistry::Init() { +@@ -117,7 +117,7 @@ void ContentSettingsRegistry::Init() { // WARNING: The string names of the permissions passed in below are used to // generate preference names and should never be changed! @@ -22,5 +22,5 @@ index cfc4f65..7504eba 100644 WhitelistedSchemes(kChromeUIScheme, kChromeDevToolsScheme), ValidSettings(CONTENT_SETTING_ALLOW, CONTENT_SETTING_BLOCK, -- -2.4.3 +2.6.2 diff --git a/patches/iridium-browser/profile-resetter-do-not-tick-send-settings-by-defaul.patch b/patches/iridium-browser/profile-resetter-do-not-tick-send-settings-by-defaul.patch index 9ae09aae..caae2e63 100644 --- a/patches/iridium-browser/profile-resetter-do-not-tick-send-settings-by-defaul.patch +++ b/patches/iridium-browser/profile-resetter-do-not-tick-send-settings-by-defaul.patch @@ -1,7 +1,7 @@ -From ccb41c8f24498af2610fbf4daccc1ac439fb98b7 Mon Sep 17 00:00:00 2001 +From 939ceb56a4ceb9e4a75b700ea0b1badbd3973a49 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Tue, 28 Oct 2014 18:45:19 +0100 -Subject: [PATCH 06/56] profile-resetter: do not tick send-settings by default +Subject: [PATCH 06/57] 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 @@ -15,7 +15,7 @@ any information. 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 b92c9fd..dadaad0 100644 +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 @@ @@ -28,5 +28,5 @@ index b92c9fd..dadaad0 100644 -- -2.4.3 +2.6.2 diff --git a/patches/iridium-browser/promo-disable-Google-promotion-fetching.patch b/patches/iridium-browser/promo-disable-Google-promotion-fetching.patch index 4e597401..e0d6fc4b 100644 --- a/patches/iridium-browser/promo-disable-Google-promotion-fetching.patch +++ b/patches/iridium-browser/promo-disable-Google-promotion-fetching.patch @@ -1,7 +1,7 @@ -From 9cb2d521effb9d66a5fa5578b5a49d102ea5e249 Mon Sep 17 00:00:00 2001 +From cebb36e36a7b08aded402aea101686a0086849bb Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Sun, 9 Nov 2014 01:54:27 +0100 -Subject: [PATCH 48/56] promo: disable Google promotion fetching +Subject: [PATCH 47/57] promo: disable Google promotion fetching Documentation is scarce, and sprinkled with misleading acronyms. NTP is not NTP, for example. FWIW: @@ -17,30 +17,16 @@ Google. References: https://github.com/iridium-browser/iridium-browser/issues/33 --- - chrome/browser/browser_process_impl.cc | 2 ++ - chrome/browser/signin/signin_promo.cc | 5 +++-- - components/web_resource/notification_promo.cc | 2 +- - 3 files changed, 6 insertions(+), 3 deletions(-) + chrome/browser/signin/signin_promo.cc | 5 +++-- + components/web_resource/notification_promo.cc | 2 +- + ios/chrome/browser/application_context_impl.cc | 4 +++- + 3 files changed, 7 insertions(+), 4 deletions(-) -diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_process_impl.cc -index fecf890..ae52be8 100644 ---- a/chrome/browser/browser_process_impl.cc -+++ b/chrome/browser/browser_process_impl.cc -@@ -1092,7 +1092,9 @@ void BrowserProcessImpl::PreMainMessageLoopRun() { - local_state(), chrome::GetChannel(), GetApplicationLocale(), - system_request_context(), switches::kDisableBackgroundNetworking, - base::Bind(safe_json::SafeJsonParser::Parse))); -+#if 0 - promo_resource_service_->StartAfterDelay(); -+#endif - } - - #if !defined(OS_ANDROID) && !defined(OS_IOS) diff --git a/chrome/browser/signin/signin_promo.cc b/chrome/browser/signin/signin_promo.cc -index 9db75c8..3ae6455a 100644 +index b3a8bef..43b8e0d 100644 --- a/chrome/browser/signin/signin_promo.cc +++ b/chrome/browser/signin/signin_promo.cc -@@ -105,6 +105,7 @@ bool ShouldShowPromo(Profile* profile) { +@@ -109,6 +109,7 @@ bool ShouldShowPromo(Profile* profile) { bool ShouldShowPromoAtStartup(Profile* profile, bool is_new_profile) { DCHECK(profile); @@ -48,7 +34,7 @@ index 9db75c8..3ae6455a 100644 // Don't show if the profile is an incognito. if (profile->IsOffTheRecord()) -@@ -262,8 +263,8 @@ void ForceWebBasedSigninFlowForTesting(bool force) { +@@ -353,8 +354,8 @@ void ForceWebBasedSigninFlowForTesting(bool force) { void RegisterProfilePrefs( user_prefs::PrefRegistrySyncable* registry) { registry->RegisterIntegerPref(prefs::kSignInPromoStartupCount, 0); @@ -60,10 +46,10 @@ index 9db75c8..3ae6455a 100644 } diff --git a/components/web_resource/notification_promo.cc b/components/web_resource/notification_promo.cc -index 73e7d4b..2f526b5 100644 +index f0e9e71..db556e4 100644 --- a/components/web_resource/notification_promo.cc +++ b/components/web_resource/notification_promo.cc -@@ -30,7 +30,7 @@ namespace { +@@ -34,7 +34,7 @@ namespace { const int kDefaultGroupSize = 100; @@ -72,6 +58,26 @@ index 73e7d4b..2f526b5 100644 // The name of the preference that stores the promotion object. const char kPrefPromoObject[] = "promo"; +diff --git a/ios/chrome/browser/application_context_impl.cc b/ios/chrome/browser/application_context_impl.cc +index eee2f06..723ee82 100644 +--- a/ios/chrome/browser/application_context_impl.cc ++++ b/ios/chrome/browser/application_context_impl.cc +@@ -1,4 +1,4 @@ +-// Copyright 2014 The Chromium Authors. All rights reserved. ++\// Copyright 2014 The Chromium Authors. All rights reserved. + // Use of this source code is governed by a BSD-style license that can be + // found in the LICENSE file. + +@@ -116,7 +116,9 @@ void ApplicationContextImpl::PreMainMessageLoopRun() { + GetLocalState(), ::GetChannel(), GetApplicationLocale(), + GetSystemURLRequestContext(), kDummyDisableBackgroundNetworking, + web_resource::GetIOSChromeParseJSONCallback())); ++#if 0 + promo_resource_service_->StartAfterDelay(); ++#endif + } + } + -- -2.4.3 +2.6.2 diff --git a/patches/iridium-browser/safe_browsing-disable-cookie-transmission.patch b/patches/iridium-browser/safe_browsing-disable-cookie-transmission.patch index 5a9c33b2..33d4e389 100644 --- a/patches/iridium-browser/safe_browsing-disable-cookie-transmission.patch +++ b/patches/iridium-browser/safe_browsing-disable-cookie-transmission.patch @@ -1,7 +1,7 @@ -From 7f26eb85a41d5ee057eaa31d5bde24940fedc7f0 Mon Sep 17 00:00:00 2001 +From a87a78526fc6a7d8434b66c479b1f825378b9378 Mon Sep 17 00:00:00 2001 From: Joachim Bauch Date: Wed, 22 Jul 2015 12:24:15 +0200 -Subject: [PATCH 46/56] safe_browsing: disable cookie transmission +Subject: [PATCH 45/57] safe_browsing: disable cookie transmission Disables sending/setting cookies for Safebrowsing requests. This prevents the long-living tracking cookie from being set. @@ -10,9 +10,9 @@ References: https://github.com/iridium-browser/iridium-browser/issues/37 --- .../safe_browsing/client_side_detection_service.cc | 8 ++++++-- .../browser/safe_browsing/download_protection_service.cc | 4 +++- - chrome/browser/safe_browsing/malware_details_cache.cc | 3 ++- chrome/browser/safe_browsing/protocol_manager.cc | 16 ++++++++++++---- chrome/browser/safe_browsing/srt_fetcher_win.cc | 4 +++- + chrome/browser/safe_browsing/threat_details_cache.cc | 3 ++- 5 files changed, 26 insertions(+), 9 deletions(-) diff --git a/chrome/browser/safe_browsing/client_side_detection_service.cc b/chrome/browser/safe_browsing/client_side_detection_service.cc @@ -42,10 +42,10 @@ index c749294..ef3186b 100644 fetcher->SetUploadData("application/octet-stream", request_data); fetcher->Start(); diff --git a/chrome/browser/safe_browsing/download_protection_service.cc b/chrome/browser/safe_browsing/download_protection_service.cc -index 228894f..f126674 100644 +index e7b3f2f..dd9051c 100644 --- a/chrome/browser/safe_browsing/download_protection_service.cc +++ b/chrome/browser/safe_browsing/download_protection_service.cc -@@ -867,7 +867,9 @@ class DownloadProtectionService::CheckClientDownloadRequest +@@ -872,7 +872,9 @@ class DownloadProtectionService::CheckClientDownloadRequest fetcher_ = net::URLFetcher::Create(0 /* ID used for testing */, GetDownloadRequestUrl(), net::URLFetcher::POST, this); @@ -56,25 +56,11 @@ index 228894f..f126674 100644 fetcher_->SetAutomaticallyRetryOn5xx(false); // Don't retry on error. fetcher_->SetRequestContext(service_->request_context_getter_.get()); fetcher_->SetUploadData("application/octet-stream", -diff --git a/chrome/browser/safe_browsing/malware_details_cache.cc b/chrome/browser/safe_browsing/malware_details_cache.cc -index ae76255..9bf7493 100644 ---- a/chrome/browser/safe_browsing/threat_details_cache.cc -+++ b/chrome/browser/safe_browsing/threat_details_cache.cc -@@ -83,7 +83,8 @@ void ThreatDetailsCacheCollector::OpenEntry() { - current_fetch_->SetRequestContext(request_context_getter_.get()); - // Only from cache, and don't save cookies. - current_fetch_->SetLoadFlags(net::LOAD_ONLY_FROM_CACHE | -- net::LOAD_DO_NOT_SAVE_COOKIES); -+ net::LOAD_DO_NOT_SAVE_COOKIES | -+ net::LOAD_DO_NOT_SEND_COOKIES); - current_fetch_->SetAutomaticallyRetryOn5xx(false); // No retries. - current_fetch_->Start(); // OnURLFetchComplete will be called when done. - } diff --git a/chrome/browser/safe_browsing/protocol_manager.cc b/chrome/browser/safe_browsing/protocol_manager.cc -index 0be2eb2..dd464f8 100644 +index f97dde7..a66ef26 100644 --- a/chrome/browser/safe_browsing/protocol_manager.cc +++ b/chrome/browser/safe_browsing/protocol_manager.cc -@@ -223,7 +223,9 @@ void SafeBrowsingProtocolManager::GetFullHash( +@@ -275,7 +275,9 @@ void SafeBrowsingProtocolManager::GetFullHash( const std::string get_hash = FormatGetHash(prefixes); @@ -85,7 +71,7 @@ index 0be2eb2..dd464f8 100644 fetcher->SetRequestContext(request_context_getter_.get()); fetcher->SetUploadData("text/plain", get_hash); fetcher->Start(); -@@ -587,7 +589,9 @@ bool SafeBrowsingProtocolManager::IssueBackupUpdateRequest( +@@ -813,7 +815,9 @@ bool SafeBrowsingProtocolManager::IssueBackupUpdateRequest( GURL backup_update_url = BackupUpdateUrl(backup_update_reason); request_ = net::URLFetcher::Create(url_fetcher_id_++, backup_update_url, net::URLFetcher::POST, this); @@ -96,7 +82,7 @@ index 0be2eb2..dd464f8 100644 request_->SetRequestContext(request_context_getter_.get()); request_->SetUploadData("text/plain", update_list_data_); request_->Start(); -@@ -614,7 +618,9 @@ void SafeBrowsingProtocolManager::IssueChunkRequest() { +@@ -840,7 +844,9 @@ void SafeBrowsingProtocolManager::IssueChunkRequest() { request_type_ = CHUNK_REQUEST; request_ = net::URLFetcher::Create(url_fetcher_id_++, chunk_url, net::URLFetcher::GET, this); @@ -107,7 +93,7 @@ index 0be2eb2..dd464f8 100644 request_->SetRequestContext(request_context_getter_.get()); chunk_request_start_ = base::Time::Now(); request_->Start(); -@@ -665,7 +671,9 @@ void SafeBrowsingProtocolManager::OnGetChunksComplete( +@@ -891,7 +897,9 @@ void SafeBrowsingProtocolManager::OnGetChunksComplete( GURL update_url = UpdateUrl(is_extended_reporting); request_ = net::URLFetcher::Create(url_fetcher_id_++, update_url, net::URLFetcher::POST, this); @@ -119,10 +105,10 @@ index 0be2eb2..dd464f8 100644 request_->SetUploadData("text/plain", update_list_data_); request_->Start(); diff --git a/chrome/browser/safe_browsing/srt_fetcher_win.cc b/chrome/browser/safe_browsing/srt_fetcher_win.cc -index e21be25..b3bc395 100644 +index 2c0ee0e..d51fc70 100644 --- a/chrome/browser/safe_browsing/srt_fetcher_win.cc +++ b/chrome/browser/safe_browsing/srt_fetcher_win.cc -@@ -220,7 +220,9 @@ class SRTFetcher : public net::URLFetcherDelegate { +@@ -224,7 +224,9 @@ class SRTFetcher : public net::URLFetcherDelegate { GURL(GetSRTDownloadURL()), net::URLFetcher::GET, this)) { @@ -133,6 +119,20 @@ index e21be25..b3bc395 100644 url_fetcher_->SetMaxRetriesOn5xx(3); url_fetcher_->SaveResponseToTemporaryFile( BrowserThread::GetMessageLoopProxyForThread(BrowserThread::FILE)); +diff --git a/chrome/browser/safe_browsing/threat_details_cache.cc b/chrome/browser/safe_browsing/threat_details_cache.cc +index 4782bde..275baf8 100644 +--- a/chrome/browser/safe_browsing/threat_details_cache.cc ++++ b/chrome/browser/safe_browsing/threat_details_cache.cc +@@ -85,7 +85,8 @@ void ThreatDetailsCacheCollector::OpenEntry() { + current_fetch_->SetRequestContext(request_context_getter_.get()); + // Only from cache, and don't save cookies. + current_fetch_->SetLoadFlags(net::LOAD_ONLY_FROM_CACHE | +- net::LOAD_DO_NOT_SAVE_COOKIES); ++ net::LOAD_DO_NOT_SAVE_COOKIES | ++ net::LOAD_DO_NOT_SEND_COOKIES); + current_fetch_->SetAutomaticallyRetryOn5xx(false); // No retries. + current_fetch_->Start(); // OnURLFetchComplete will be called when done. + } -- -2.4.3 +2.6.2 diff --git a/patches/iridium-browser/safe_browsing-disable-incident-reporting.patch b/patches/iridium-browser/safe_browsing-disable-incident-reporting.patch index 92065ebb..0c20cece 100644 --- a/patches/iridium-browser/safe_browsing-disable-incident-reporting.patch +++ b/patches/iridium-browser/safe_browsing-disable-incident-reporting.patch @@ -1,7 +1,7 @@ -From fffc7e171d7ee5f80360fb8e37da838c46e8c2de Mon Sep 17 00:00:00 2001 +From cfa60043edb018eeb746d4d99b4e5e5787eace7d Mon Sep 17 00:00:00 2001 From: Joachim Bauch Date: Tue, 7 Jul 2015 17:02:09 +0200 -Subject: [PATCH 43/56] safe_browsing: disable incident reporting +Subject: [PATCH 42/57] safe_browsing: disable incident reporting Disables the safebrowsing incident reporting where you could upload information about a blocked URL to Google (also added a trk prefix to @@ -14,10 +14,10 @@ the URL so we get notified if this happens again in the future). 4 files changed, 12 insertions(+), 5 deletions(-) diff --git a/chrome/browser/safe_browsing/incident_reporting/incident_report_uploader_impl.cc b/chrome/browser/safe_browsing/incident_reporting/incident_report_uploader_impl.cc -index b5e7684..01627a4 100644 +index f6503859..7e2c5c7 100644 --- a/chrome/browser/safe_browsing/incident_reporting/incident_report_uploader_impl.cc +++ b/chrome/browser/safe_browsing/incident_reporting/incident_report_uploader_impl.cc -@@ -17,7 +17,7 @@ namespace safe_browsing { +@@ -19,7 +19,7 @@ namespace safe_browsing { namespace { const char kSbIncidentReportUrl[] = @@ -27,10 +27,10 @@ index b5e7684..01627a4 100644 } // namespace diff --git a/chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.cc b/chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.cc -index 9dc0c27..35fbcd4 100644 +index 5878376..06719f8 100644 --- a/chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.cc +++ b/chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.cc -@@ -285,6 +285,8 @@ IncidentReportingService::UploadContext::~UploadContext() { +@@ -287,6 +287,8 @@ IncidentReportingService::UploadContext::~UploadContext() { // static bool IncidentReportingService::IsEnabledForProfile(Profile* profile) { @@ -39,7 +39,7 @@ index 9dc0c27..35fbcd4 100644 if (profile->IsOffTheRecord()) return false; if (!profile->GetPrefs()->GetBoolean(prefs::kSafeBrowsingEnabled)) -@@ -293,6 +295,7 @@ bool IncidentReportingService::IsEnabledForProfile(Profile* profile) { +@@ -295,6 +297,7 @@ bool IncidentReportingService::IsEnabledForProfile(Profile* profile) { return true; return profile->GetPrefs()->GetBoolean( prefs::kSafeBrowsingExtendedReportingEnabled); @@ -48,61 +48,52 @@ index 9dc0c27..35fbcd4 100644 IncidentReportingService::IncidentReportingService( diff --git a/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc b/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc -index 342e59d..ddac6f2 100644 +index 5c71fa6..eb54df2 100644 --- a/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc +++ b/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc -@@ -58,17 +58,17 @@ namespace { +@@ -61,17 +61,17 @@ namespace { // diagnostic page. #if defined(GOOGLE_CHROME_BUILD) const char kSbDiagnosticUrl[] = - "https://www.9oo91e.qjz9zk/safebrowsing/diagnostic?site=%s&client=googlechrome"; -+ "trk:227:https://www.9oo91e.qjz9zk/safebrowsing/diagnostic?site=%s&client=googlechrome"; ++ /* trk:227 */ "https://www.9oo91e.qjz9zk/safebrowsing/diagnostic?site=%s&client=googlechrome"; #else const char kSbDiagnosticUrl[] = - "https://www.9oo91e.qjz9zk/safebrowsing/diagnostic?site=%s&client=chromium"; -+ "trk:228:https://www.9oo91e.qjz9zk/safebrowsing/diagnostic?site=%s&client=chromium"; ++ /* trk:228 */ "https://www.9oo91e.qjz9zk/safebrowsing/diagnostic?site=%s&client=chromium"; #endif // URL for malware and phishing, V2. const char kLearnMoreMalwareUrlV2[] = - "https://www.9oo91e.qjz9zk/transparencyreport/safebrowsing/"; -+ "trk:225:https://www.9oo91e.qjz9zk/transparencyreport/safebrowsing/"; ++ /* trk:225 */ "https://www.9oo91e.qjz9zk/transparencyreport/safebrowsing/"; const char kLearnMorePhishingUrlV2[] = - "https://www.9oo91e.qjz9zk/transparencyreport/safebrowsing/"; -+ "trk:226:https://www.9oo91e.qjz9zk/transparencyreport/safebrowsing/"; ++ /* trk:226 */ "https://www.9oo91e.qjz9zk/transparencyreport/safebrowsing/"; // Constants for the V4 phishing string upgrades. const char kSocialEngineeringTrial[] = "SafeBrowsingSocialEngineeringStrings"; -@@ -88,7 +88,7 @@ const char kEventNameOther[] = "safebrowsing_other_interstitial_"; - - // Constants for the V4 phishing string upgrades. - const char kReportPhishingErrorUrl[] = -- "https://www.9oo91e.qjz9zk/safebrowsing/report_error/"; -+ "trk:306:https://www.9oo91e.qjz9zk/safebrowsing/report_error/"; - const char kReportPhishingErrorTrial[] = "SafeBrowsingReportPhishingErrorLink"; - const char kReportPhishingErrorEnabled[] = "Enabled"; - -@@ -630,6 +630,7 @@ void SafeBrowsingBlockingPage::PopulateInterstitialStrings( +@@ -626,6 +626,7 @@ void SafeBrowsingBlockingPage::PopulateInterstitialStrings( void SafeBrowsingBlockingPage::PopulateExtendedReportingOption( base::DictionaryValue* load_time_data) { +#if 0 // Only show checkbox if !(HTTPS || incognito-mode). const bool show = CanShowThreatDetailsOption(); - load_time_data->SetBoolean(interstitials::kDisplayCheckBox, show); -@@ -646,6 +647,7 @@ void SafeBrowsingBlockingPage::PopulateExtendedReportingOption( + load_time_data->SetBoolean(security_interstitials::kDisplayCheckBox, show); +@@ -643,6 +644,7 @@ void SafeBrowsingBlockingPage::PopulateExtendedReportingOption( load_time_data->SetBoolean( - interstitials::kBoxChecked, + security_interstitials::kBoxChecked, IsPrefEnabled(prefs::kSafeBrowsingExtendedReportingEnabled)); +#endif } void SafeBrowsingBlockingPage::PopulateMalwareLoadTimeData( diff --git a/chrome/browser/safe_browsing/safe_browsing_service.cc b/chrome/browser/safe_browsing/safe_browsing_service.cc -index d01f175..835107e 100644 +index ed7aea9..e180699 100644 --- a/chrome/browser/safe_browsing/safe_browsing_service.cc +++ b/chrome/browser/safe_browsing/safe_browsing_service.cc -@@ -398,9 +398,11 @@ SafeBrowsingService::CreateIncidentReportingService() { +@@ -399,9 +399,11 @@ SafeBrowsingService::CreateIncidentReportingService() { void SafeBrowsingService::RegisterAllDelayedAnalysis() { #if defined(FULL_SAFE_BROWSING) @@ -115,5 +106,5 @@ index d01f175..835107e 100644 NOTREACHED(); #endif -- -2.4.3 +2.6.2 diff --git a/patches/iridium-browser/safe_browsing-disable-reporting-of-safebrowsing-over.patch b/patches/iridium-browser/safe_browsing-disable-reporting-of-safebrowsing-over.patch index 51b7749e..7f798e44 100644 --- a/patches/iridium-browser/safe_browsing-disable-reporting-of-safebrowsing-over.patch +++ b/patches/iridium-browser/safe_browsing-disable-reporting-of-safebrowsing-over.patch @@ -1,7 +1,7 @@ -From f1c8098c753e889a2d840ddeb8181a4f2909511f Mon Sep 17 00:00:00 2001 +From 7b1b98f0ad43d405374c6613e2517d6c5f7ecbf7 Mon Sep 17 00:00:00 2001 From: Joachim Bauch Date: Tue, 7 Jul 2015 18:28:46 +0200 -Subject: [PATCH 44/56] safe_browsing: disable reporting of safebrowsing +Subject: [PATCH 43/57] safe_browsing: disable reporting of safebrowsing override Disables reporting of the safebrowsing override, i.e. the report sent @@ -68,5 +68,5 @@ index 6f431e5..c749294 100644 -- -2.4.3 +2.6.2 diff --git a/patches/iridium-browser/safe_browsing-support-trk-prefix.patch b/patches/iridium-browser/safe_browsing-support-trk-prefix.patch index d3f1def8..37b8f099 100644 --- a/patches/iridium-browser/safe_browsing-support-trk-prefix.patch +++ b/patches/iridium-browser/safe_browsing-support-trk-prefix.patch @@ -1,31 +1,33 @@ -From a61d136fcec75f0bdbddc5b17dc3ddcc328ea7a7 Mon Sep 17 00:00:00 2001 +From 19a5d4247c63146ce9a3f0879284b185fcf32ca4 Mon Sep 17 00:00:00 2001 From: Joachim Bauch Date: Mon, 6 Jul 2015 18:18:03 +0200 -Subject: [PATCH 45/56] safe_browsing: support trk: prefix +Subject: [PATCH 44/57] safe_browsing: support trk: prefix --- - chrome/browser/safe_browsing/protocol_manager.cc | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) + chrome/browser/safe_browsing/protocol_manager.cc | 8 +++++--- + 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/chrome/browser/safe_browsing/protocol_manager.cc b/chrome/browser/safe_browsing/protocol_manager.cc -index 054d5e1..0be2eb2 100644 +index f56103f..f97dde7 100644 --- a/chrome/browser/safe_browsing/protocol_manager.cc +++ b/chrome/browser/safe_browsing/protocol_manager.cc -@@ -762,11 +762,13 @@ GURL SafeBrowsingProtocolManager::GetHashUrl(bool is_extended_reporting) const { +@@ -1004,11 +1004,13 @@ GURL SafeBrowsingProtocolManager::GetV4HashUrl( GURL SafeBrowsingProtocolManager::NextChunkUrl(const std::string& url) const { DCHECK(CalledOnValidThread()); std::string next_url; -+ const std::string url_prefix_without_trk( -+ GURL(url_prefix_).strip_trk().spec()); - if (!base::StartsWith(url, "http://", base::CompareCase::INSENSITIVE_ASCII) && - !base::StartsWith(url, "https://", +- if (!base::StartsWith(url, "http://", base::CompareCase::INSENSITIVE_ASCII) && +- !base::StartsWith(url, "https://", ++ const std::string notrk_url(GURL(url).strip_trk().spec()); ++ const std::string notrk_url_prefix_(GURL(url_prefix_).strip_trk().spec()); ++ if (!base::StartsWith(notrk_url, "http://", base::CompareCase::INSENSITIVE_ASCII) && ++ !base::StartsWith(notrk_url, "https://", base::CompareCase::INSENSITIVE_ASCII)) { // Use https if we updated via https, otherwise http (useful for testing). - if (base::StartsWith(url_prefix_, "https://", -+ if (base::StartsWith(url_prefix_without_trk, "https://", ++ if (base::StartsWith(notrk_url_prefix_, "https://", base::CompareCase::INSENSITIVE_ASCII)) next_url.append("https://"); else -- -2.4.3 +2.6.2 diff --git a/patches/iridium-browser/search-show-blank-tab-for-new-tab-page.patch b/patches/iridium-browser/search-show-blank-tab-for-new-tab-page.patch new file mode 100644 index 00000000..e956e266 --- /dev/null +++ b/patches/iridium-browser/search-show-blank-tab-for-new-tab-page.patch @@ -0,0 +1,53 @@ +From ff0c7338dbad1c58a73051cb6dff39ebd38acf84 Mon Sep 17 00:00:00 2001 +From: Joachim Bauch +Date: Mon, 6 Jul 2015 17:17:20 +0200 +Subject: [PATCH 50/57] 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 45732f8..bed8190 100644 +--- a/chrome/browser/search/search.cc ++++ b/chrome/browser/search/search.cc +@@ -233,6 +233,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) { +@@ -246,6 +247,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. +@@ -254,6 +256,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(); +@@ -279,6 +284,7 @@ struct NewTabURLDetails { + // Use the local New Tab otherwise. + return NewTabURLDetails(local_url, state); + } ++#endif + } + + GURL url; +-- +2.6.2 + diff --git a/patches/iridium-browser/spellchecker-flag-downloading-dictionary-from-Google.patch b/patches/iridium-browser/spellchecker-flag-downloading-dictionary-from-Google.patch index a2a21607..609a141f 100644 --- a/patches/iridium-browser/spellchecker-flag-downloading-dictionary-from-Google.patch +++ b/patches/iridium-browser/spellchecker-flag-downloading-dictionary-from-Google.patch @@ -1,17 +1,17 @@ -From c69d005155ac6dcfe9b348a20a312e2b06702f15 Mon Sep 17 00:00:00 2001 +From 0d34d1f0326d44f8fa8a92cefaa4eef2f765fa00 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Fri, 29 May 2015 15:55:42 +0200 -Subject: [PATCH 39/56] spellchecker: flag downloading dictionary from Google +Subject: [PATCH 38/57] 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 149dace..1ab8620 100644 +index e954815..997a75c 100644 --- a/chrome/browser/resources/options/language_options.js +++ b/chrome/browser/resources/options/language_options.js -@@ -1018,6 +1018,8 @@ cr.define('options', function() { +@@ -1033,6 +1033,8 @@ cr.define('options', function() { * @private */ handleSpellCheckLanguageButtonClick_: function(e) { @@ -21,5 +21,5 @@ index 149dace..1ab8620 100644 // Save the preference. Preferences.setListPref(SPELL_CHECK_DICTIONARIES_PREF, -- -2.4.3 +2.6.2 diff --git a/patches/iridium-browser/translate-disable-fetching-of-translate-languages-fr.patch b/patches/iridium-browser/translate-disable-fetching-of-translate-languages-fr.patch index 7b5375ec..88ad7af1 100644 --- a/patches/iridium-browser/translate-disable-fetching-of-translate-languages-fr.patch +++ b/patches/iridium-browser/translate-disable-fetching-of-translate-languages-fr.patch @@ -1,7 +1,7 @@ -From 60afad05fab5547e0484942fbe45cb1126bc9a45 Mon Sep 17 00:00:00 2001 +From a972e68198e991086ed6d6e25299c0deb7fd31b8 Mon Sep 17 00:00:00 2001 From: Simon Eisenmann Date: Mon, 26 Oct 2015 14:18:05 +0100 -Subject: [PATCH 55/56] translate: disable fetching of translate languages from +Subject: [PATCH 54/57] translate: disable fetching of translate languages from server GH issue #18. @@ -10,10 +10,10 @@ GH issue #18. 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 a9ce331..0253f77 100644 +index 881406b..7b05f1f 100644 --- a/components/translate/core/browser/translate_language_list.cc +++ b/components/translate/core/browser/translate_language_list.cc -@@ -126,10 +126,12 @@ const char* const kDefaultSupportedLanguages[] = { +@@ -129,10 +129,12 @@ const char* const kDefaultSupportedLanguages[] = { // Constant URL string to fetch server supporting language list. const char kLanguageListFetchPath[] = "translate_a/l?client=chrome"; @@ -25,8 +25,8 @@ index a9ce331..0253f77 100644 +#endif // Represent if the language list updater is disabled. - // Android does not handle well language updates, leading to bugs -@@ -207,6 +209,7 @@ GURL TranslateLanguageList::TranslateLanguageUrl() { + bool update_is_disabled = false; +@@ -203,6 +205,7 @@ GURL TranslateLanguageList::TranslateLanguageUrl() { } void TranslateLanguageList::RequestLanguageList() { @@ -34,7 +34,7 @@ index a9ce331..0253f77 100644 // If resource requests are not allowed, we'll get a callback when they are. if (!resource_requests_allowed_) { request_pending_ = true; -@@ -236,6 +239,7 @@ void TranslateLanguageList::RequestLanguageList() { +@@ -232,6 +235,7 @@ void TranslateLanguageList::RequestLanguageList() { if (!result) NotifyEvent(__LINE__, "Request is omitted due to retry limit"); } @@ -43,5 +43,5 @@ index a9ce331..0253f77 100644 void TranslateLanguageList::SetResourceRequestsAllowed(bool allowed) { -- -2.4.3 +2.6.2 diff --git a/patches/iridium-browser/updater-disable-auto-update.patch b/patches/iridium-browser/updater-disable-auto-update.patch index 0af50d18..b826a4cc 100644 --- a/patches/iridium-browser/updater-disable-auto-update.patch +++ b/patches/iridium-browser/updater-disable-auto-update.patch @@ -1,7 +1,7 @@ -From e626587ea7c7f08c6a5abe58056cfd6fbf060df5 Mon Sep 17 00:00:00 2001 +From 9faa42f02cc9223ae616158ec5fb5a0098edf0bb Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Fri, 13 Feb 2015 00:59:04 +0100 -Subject: [PATCH 33/56] updater: disable auto-update +Subject: [PATCH 32/57] updater: disable auto-update As per http://www.ch40m1um.qjz9zk/administrators/turning-off-auto-updates , the auto update function is decidedly disabled on Linux, i.e. @@ -15,10 +15,10 @@ the case anyway, since we are based off Chromium, not Chrome. 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chrome/browser/app_controller_mac.mm b/chrome/browser/app_controller_mac.mm -index 708f81e..85de2c1 100644 +index 36da6d0..3b112df 100644 --- a/chrome/browser/app_controller_mac.mm +++ b/chrome/browser/app_controller_mac.mm -@@ -668,7 +668,7 @@ class AppControllerProfileObserver : public ProfileInfoCacheObserver { +@@ -671,7 +671,7 @@ class AppControllerProfileObserver : public ProfileInfoCacheObserver { CFStringRef checkInterval = CFSTR("checkInterval"); CFPropertyListRef plist = CFPreferencesCopyAppValue(checkInterval, app); if (!plist) { @@ -28,5 +28,5 @@ index 708f81e..85de2c1 100644 CFPreferencesSetAppValue(checkInterval, value, app); CFPreferencesAppSynchronize(app); -- -2.4.3 +2.6.2 diff --git a/patches/iridium-browser/updater-disable-updater-pings.patch b/patches/iridium-browser/updater-disable-updater-pings.patch index f25719d7..37cbe299 100644 --- a/patches/iridium-browser/updater-disable-updater-pings.patch +++ b/patches/iridium-browser/updater-disable-updater-pings.patch @@ -1,7 +1,7 @@ -From d4c304554269ef3952ce430aff4275ce592ae29c Mon Sep 17 00:00:00 2001 +From f426a5383196d17903a504fb1e6f6eb397f57ca4 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Tue, 2 Jun 2015 11:01:50 +0200 -Subject: [PATCH 42/56] updater: disable updater pings +Subject: [PATCH 41/57] updater: disable updater pings Despite auto-updater being arguably disabled (see previous commit), Chromium would still send background requests. Kill it. @@ -32,10 +32,10 @@ index 7c78f64b..7dfdc89 100644 } // namespace component_updater diff --git a/components/component_updater/configurator_impl.cc b/components/component_updater/configurator_impl.cc -index cc6d7f0..b6d3ed3 100644 +index 407da85..70ac3a8 100644 --- a/components/component_updater/configurator_impl.cc +++ b/components/component_updater/configurator_impl.cc -@@ -37,7 +37,9 @@ const char kSwitchRequestParam[] = "test-request"; +@@ -39,7 +39,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. @@ -45,7 +45,7 @@ index cc6d7f0..b6d3ed3 100644 // Sets the URL for updates. const char kSwitchUrlSource[] = "url-source"; -@@ -106,7 +108,9 @@ ConfiguratorImpl::ConfiguratorImpl( +@@ -108,7 +110,9 @@ ConfiguratorImpl::ConfiguratorImpl( cmdline->GetSwitchValueASCII(switches::kComponentUpdater), ",", base::KEEP_WHITESPACE, base::SPLIT_WANT_NONEMPTY); fast_update_ = HasSwitchValue(switch_values, kSwitchFastUpdate); @@ -55,7 +55,7 @@ index cc6d7f0..b6d3ed3 100644 deltas_enabled_ = !HasSwitchValue(switch_values, kSwitchDisableDeltaUpdates); #if defined(OS_WIN) -@@ -156,10 +160,12 @@ std::vector ConfiguratorImpl::UpdateUrl() const { +@@ -158,10 +162,12 @@ std::vector ConfiguratorImpl::UpdateUrl() const { if (url_source_override_.is_valid()) { urls.push_back(GURL(url_source_override_)); } else { @@ -69,5 +69,5 @@ index cc6d7f0..b6d3ed3 100644 return urls; } -- -2.4.3 +2.6.2 diff --git a/patches/iridium-browser/webrtc-disable-WebRTC-identity-store.patch b/patches/iridium-browser/webrtc-disable-WebRTC-identity-store.patch index e83523eb..03933bfe 100644 --- a/patches/iridium-browser/webrtc-disable-WebRTC-identity-store.patch +++ b/patches/iridium-browser/webrtc-disable-WebRTC-identity-store.patch @@ -1,7 +1,7 @@ -From 5fb5f9a9e410d81c7cba4ebd07ede4fa6e765d4c Mon Sep 17 00:00:00 2001 +From 529cae5e1ce1fd93453264392169ea37fa1ecc79 Mon Sep 17 00:00:00 2001 From: Joachim Bauch Date: Mon, 10 Nov 2014 10:54:29 +0100 -Subject: [PATCH 02/56] webrtc: disable WebRTC identity store +Subject: [PATCH 02/57] webrtc: disable WebRTC identity store By default, WebRTC identities (i.e. keypairs/certificates) are cached for 30 days and stored in a SQLite database in the users home @@ -19,10 +19,10 @@ connection. 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/content/browser/media/webrtc_identity_store.cc b/content/browser/media/webrtc_identity_store.cc -index 9867a2f..5fa5980 100644 +index 2ada2a1..0dd3466 100644 --- a/content/browser/media/webrtc_identity_store.cc +++ b/content/browser/media/webrtc_identity_store.cc -@@ -82,7 +82,7 @@ class WebRTCIdentityRequest { +@@ -86,7 +86,7 @@ class WebRTCIdentityRequest { : origin_(origin), identity_name_(identity_name), common_name_(common_name), @@ -31,7 +31,7 @@ index 9867a2f..5fa5980 100644 void Cancel(WebRTCIdentityRequestHandle* handle) { DCHECK_CURRENTLY_ON(BrowserThread::IO); -@@ -191,6 +191,7 @@ base::Closure WebRTCIdentityStore::RequestIdentity( +@@ -194,6 +194,7 @@ base::Closure WebRTCIdentityStore::RequestIdentity( const CompletionCallback& callback, bool enable_cache) { DCHECK_CURRENTLY_ON(BrowserThread::IO); @@ -39,7 +39,7 @@ index 9867a2f..5fa5980 100644 WebRTCIdentityRequest* request = FindRequest(origin, identity_name, common_name); // If there is no identical request in flight, create a new one, queue it, -@@ -264,6 +265,8 @@ void WebRTCIdentityStore::GenerateIdentityCallback( +@@ -267,6 +268,8 @@ void WebRTCIdentityStore::GenerateIdentityCallback( WebRTCIdentityRequest* request, WebRTCIdentityRequestResult* result) { DCHECK_CURRENTLY_ON(BrowserThread::IO); @@ -49,5 +49,5 @@ index 9867a2f..5fa5980 100644 DVLOG(2) << "New identity generated and added to the backend."; backend_->AddIdentity(request->origin_, -- -2.4.3 +2.6.2 diff --git a/patches/iridium-browser/webrtc-generate-real-ephemeral-keys.patch b/patches/iridium-browser/webrtc-generate-real-ephemeral-keys.patch index b6cf6fa4..aae6c81a 100644 --- a/patches/iridium-browser/webrtc-generate-real-ephemeral-keys.patch +++ b/patches/iridium-browser/webrtc-generate-real-ephemeral-keys.patch @@ -1,7 +1,7 @@ -From 1e9a8771419a214805d180370bf8c2190e5bc170 Mon Sep 17 00:00:00 2001 +From 2e0016bbc9c5bee59ab1f6df01281c6d7d296e06 Mon Sep 17 00:00:00 2001 From: Joachim Bauch Date: Mon, 10 Nov 2014 16:19:32 +0100 -Subject: [PATCH 03/56] webrtc: generate "real" ephemeral keys +Subject: [PATCH 03/57] 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 @@ -13,7 +13,7 @@ We obviously do not want that. 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 31e0774..44cfffc 100644 +index ab5ab14..f8365b62 100644 --- a/net/third_party/nss/ssl/ssl3ecc.c +++ b/net/third_party/nss/ssl/ssl3ecc.c @@ -155,6 +155,7 @@ static const Bits2Curve bits2curve [] = { @@ -116,5 +116,5 @@ index 31e0774..44cfffc 100644 SECStatus -- -2.4.3 +2.6.2 diff --git a/patches/patch_order b/patches/patch_order index 6e7939d6..9e6efe17 100644 --- a/patches/patch_order +++ b/patches/patch_order @@ -36,10 +36,12 @@ 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 +iridium-browser/build-use-Wl-no-keep-memory.patch inox-patchset/disable-autofill-download-manager.patch inox-patchset/disable-default-extensions.patch