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

WIP for 48.0.2564.82

Browse Source 
Refreshed Iridium, Inox, and custom patches
Updated Debian scripts and patches to 48.0.2564.82-1
Removed Iridium patch prefs-enable-Send-a-Do-Not-Track-header.patch
Updated README.md
This commit is contained in:
Eloston
2016-01-24 17:39:16 -08:00
parent 2ef1e3703c
commit 1429f6e124
53 changed files with 234 additions and 476 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
README.md
View File

@@ -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 system-dependant patches (these are in the `build_templates` directory).
Here's some information on what's in the `patches` directory:
Here's a summary of the `patches` directory contents:
* `ungoogled-chromium/`
* This directory contains new patches for ungoogled-chromium. They implement the features described above.
* `iridium-browser`
@@ -44,7 +44,9 @@ Here's some information on what's in the `patches` directory:
## Building
Right now, only Debian and Ubuntu build scripts are provided.
If you want to use these patches in your own build of Chromium, make sure to run `domain_patcher.sh` from the root of the source tree first. Otherwise, some patches will need to be modified to apply. In the situation that you run `domain_patcher.sh` and your build flags require the downloading of additional files during compilation-time, the download URLs will most likely be invalid.
At this time, ungoogled-chromium only provides Debian and Ubuntu package build scripts that will automate the whole downloading, patching, and building process. The main script is `build_debian.sh`; all other sibling scripts are invoked by the main script.
### Debian and derivatives
**NOTE:** Tested on Debian Stretch 64-bit and Ubuntu Wily 64-bit
@@ -56,7 +58,7 @@ Right now, only Debian and Ubuntu build scripts are provided.
Debian packages will appear under `ungoogled-chromium/`
For more options, run `./build_debian.sh -h` to see the available options. This applies to `download_source.sh` as well.
Pass the `-h` flag into `build_debian.sh` or `download_source.sh` for more options.
## Contributing

7
build_templates/debian/changelog
View File

@@ -1,3 +1,10 @@
chromium-browser (48.0.2564.82-1) stretch; urgency=low
* New upstream version
- Based off of Debian's 48.0.2564.82-1
-- Eloston <eloston@mail.com> Fri, 22 Jan 2016 00:00:00 +0000
chromium-browser (47.0.2526.111-1) stretch; urgency=low
* New upstream version

2
build_templates/debian/patches/manpage.patch
View File

@@ -42,7 +42,7 @@ Author: Daniel Echeverry <epsilon77@gmail.com>
.SH ENVIRONMENT
--- a/chrome/chrome_exe.gypi
+++ b/chrome/chrome_exe.gypi
@@ -128,7 +128,7 @@
@@ -129,7 +129,7 @@
}, { # else branding!="Chrome"
'variables': {
'name': 'Chromium',

1
build_templates/debian/patches/series
View File

@@ -2,7 +2,6 @@ manpage.patch
master-preferences.patch
system/jpeg.patch
system/nspr.patch
system/clang.patch
system/ffmpeg.patch

2
build_templates/debian/patches/system/clang.patch
View File

@@ -3,7 +3,7 @@ author: Michael Gilbert <mgilbert@debian.org>
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -5954,8 +5954,8 @@
@@ -5980,8 +5980,8 @@
['clang==1 and ((OS!="mac" and OS!="ios") or clang_xcode==0) '
'and OS!="win"', {
'make_global_settings': [

39
build_templates/debian/patches/system/ffmpeg.patch
View File

@@ -7,20 +7,7 @@ Last-Update: <2015-07-26>
--- a/media/ffmpeg/ffmpeg_common.h
+++ b/media/ffmpeg/ffmpeg_common.h
@@ -19,20 +19,12 @@
// Include FFmpeg header files.
extern "C" {
-// Disable deprecated features which result in spammy compile warnings. This
-// list of defines must mirror those in the 'defines' section of the ffmpeg.gyp
-// file or the headers below will generate different structures.
-#define FF_API_PIX_FMT_DESC 0
-#define FF_API_OLD_DECODE_AUDIO 0
-#define FF_API_DESTRUCT_PACKET 0
-#define FF_API_GET_BUFFER 0
// Temporarily disable possible loss of data warning.
// TODO(scherkus): fix and upstream the compiler warnings.
@@ -36,7 +36,6 @@ extern "C" {
MSVC_PUSH_DISABLE_WARNING(4244);
#include <libavcodec/avcodec.h>
#include <libavformat/avformat.h>
@@ -30,19 +17,19 @@ Last-Update: <2015-07-26>
#include <libavutil/imgutils.h>
--- a/media/filters/ffmpeg_demuxer.cc
+++ b/media/filters/ffmpeg_demuxer.cc
@@ -861,7 +861,11 @@ void FFmpegDemuxer::Initialize(DemuxerHo
@@ -862,7 +862,11 @@ void FFmpegDemuxer::Initialize(DemuxerHo
// this does not increase the amount of data downloaded. The default value
// is 5 AV_TIME_BASE units (1 second each), which prevents some oddly muxed
// streams from being detected properly; this value was chosen arbitrarily.
+#if LIBAVCODEC_VERSION_MAJOR < 57
format_context->max_analyze_duration2 = 60 * AV_TIME_BASE;
+ format_context->max_analyze_duration2 = 60 * AV_TIME_BASE;
+#else
+ format_context->max_analyze_duration = 60 * AV_TIME_BASE;
format_context->max_analyze_duration = 60 * AV_TIME_BASE;
+#endif
// Open the AVFormatContext using our glue layer.
CHECK(blocking_thread_.Start());
@@ -1013,24 +1017,6 @@ void FFmpegDemuxer::OnFindStreamInfoDone
@@ -1019,24 +1023,6 @@ void FFmpegDemuxer::OnFindStreamInfoDone
// If no estimate is found, the stream entry will be kInfiniteDuration().
std::vector<base::TimeDelta> start_time_estimates(format_context->nb_streams,
kInfiniteDuration());
@@ -89,7 +76,7 @@ Last-Update: <2015-07-26>
'<(DEPTH)/third_party/libyuv/libyuv.gyp:libyuv',
'<(DEPTH)/third_party/mt19937ar/mt19937ar.gyp:mt19937ar',
'<(DEPTH)/ui/gfx/gfx.gyp:gfx_geometry',
@@ -223,7 +223,7 @@
@@ -220,7 +220,7 @@
'<(DEPTH)/net/net.gyp:net_test_support',
'<(DEPTH)/media/media.gyp:media',
'<(DEPTH)/testing/gtest.gyp:gtest',
@@ -98,7 +85,7 @@ Last-Update: <2015-07-26>
'<(DEPTH)/third_party/opus/opus.gyp:opus',
'<(DEPTH)/ui/gfx/gfx.gyp:gfx_geometry',
],
@@ -246,7 +246,7 @@
@@ -243,7 +243,7 @@
'<(DEPTH)/net/net.gyp:net_test_support',
'<(DEPTH)/media/media.gyp:media',
'<(DEPTH)/testing/gtest.gyp:gtest',
@@ -107,7 +94,7 @@ Last-Update: <2015-07-26>
'<(DEPTH)/third_party/opus/opus.gyp:opus',
'<(DEPTH)/ui/gfx/gfx.gyp:gfx_geometry',
],
@@ -359,7 +359,7 @@
@@ -356,7 +356,7 @@
'<(DEPTH)/base/base.gyp:test_support_base',
'<(DEPTH)/testing/gmock.gyp:gmock',
'<(DEPTH)/testing/gtest.gyp:gtest',
@@ -118,7 +105,7 @@ Last-Update: <2015-07-26>
'sender/h264_vt_encoder_unittest.cc',
--- a/media/media.gyp
+++ b/media/media.gyp
@@ -642,7 +642,7 @@
@@ -649,7 +649,7 @@
}],
['media_use_ffmpeg==1', {
'dependencies': [
@@ -127,7 +114,7 @@ Last-Update: <2015-07-26>
],
}, { # media_use_ffmpeg==0
# Exclude the sources that depend on ffmpeg.
@@ -1330,7 +1330,7 @@
@@ -1334,7 +1334,7 @@
}],
['media_use_ffmpeg==1', {
'dependencies': [
@@ -136,7 +123,7 @@ Last-Update: <2015-07-26>
],
}, { # media_use_ffmpeg==0
'sources!': [
@@ -1471,7 +1471,7 @@
@@ -1489,7 +1489,7 @@
}],
['media_use_ffmpeg==1', {
'dependencies': [
@@ -145,7 +132,7 @@ Last-Update: <2015-07-26>
],
}, { # media_use_ffmpeg==0
'sources!': [
@@ -1940,7 +1940,7 @@
@@ -1981,7 +1981,7 @@
'../base/base.gyp:test_support_base',
'../testing/gmock.gyp:gmock',
'../testing/gtest.gyp:gtest',
@@ -198,7 +185,7 @@ Last-Update: <2015-07-26>
['"WTF_USE_WEBAUDIO_OPENMAX_DL_FFT=1" in feature_defines', {
--- a/content/content_tests.gypi
+++ b/content/content_tests.gypi
@@ -1619,7 +1619,7 @@
@@ -1609,7 +1609,7 @@
}, {
'dependencies': [
# Runtime dependencis.

210
build_templates/debian/patches/system/jpeg.patch
View File

@@ -1,210 +0,0 @@
From 7e84668966d8b844e11af9d60e1bc6979ab46b2c Mon Sep 17 00:00:00 2001
From: Evangelos Foutras <evangelos@foutrelis.com>
Date: Mon, 19 Oct 2015 12:00:28 +0300
Subject: [PATCH] Add FPDFAPIJPEG_ prefix to more libjpeg functions
Chromium built with use_system_libjpeg=1 can mistakenly try to use
symbols exported by the libjpeg library that's bundled with pdfium.
These name conflicts result in failure to encode the contents of a
canvas element using toDataURL('image/jpeg').
BUG=505226
---
core/include/thirdparties/libjpeg/jpeglib.h | 35 +++++++++++++++++++++++++++++
third_party/libjpeg/jpeglib.h | 35 +++++++++++++++++++++++++++++
2 files changed, 70 insertions(+)
--- a/third_party/pdfium/core/include/thirdparties/libjpeg/jpeglib.h
+++ b/third_party/pdfium/core/include/thirdparties/libjpeg/jpeglib.h
@@ -20,33 +20,53 @@
#define jdiv_round_up FOXIT_PREFIX(jdiv_round_up)
#define jinit_1pass_quantizer FOXIT_PREFIX(jinit_1pass_quantizer)
#define jinit_2pass_quantizer FOXIT_PREFIX(jinit_2pass_quantizer)
+#define jinit_c_coef_controller FOXIT_PREFIX(jinit_c_coef_controller)
+#define jinit_c_main_controller FOXIT_PREFIX(jinit_c_main_controller)
+#define jinit_c_master_control FOXIT_PREFIX(jinit_c_master_control)
+#define jinit_c_prep_controller FOXIT_PREFIX(jinit_c_prep_controller)
+#define jinit_color_converter FOXIT_PREFIX(jinit_color_converter)
#define jinit_color_deconverter FOXIT_PREFIX(jinit_color_deconverter)
+#define jinit_compress_master FOXIT_PREFIX(jinit_compress_master)
#define jinit_d_coef_controller FOXIT_PREFIX(jinit_d_coef_controller)
#define jinit_d_main_controller FOXIT_PREFIX(jinit_d_main_controller)
#define jinit_d_post_controller FOXIT_PREFIX(jinit_d_post_controller)
+#define jinit_downsampler FOXIT_PREFIX(jinit_downsampler)
+#define jinit_forward_dct FOXIT_PREFIX(jinit_forward_dct)
#define jinit_huff_decoder FOXIT_PREFIX(jinit_huff_decoder)
+#define jinit_huff_encoder FOXIT_PREFIX(jinit_huff_encoder)
#define jinit_input_controller FOXIT_PREFIX(jinit_input_controller)
#define jinit_inverse_dct FOXIT_PREFIX(jinit_inverse_dct)
#define jinit_marker_reader FOXIT_PREFIX(jinit_marker_reader)
+#define jinit_marker_writer FOXIT_PREFIX(jinit_marker_writer)
#define jinit_master_decompress FOXIT_PREFIX(jinit_master_decompress)
#define jinit_memory_mgr FOXIT_PREFIX(jinit_memory_mgr)
#define jinit_merged_upsampler FOXIT_PREFIX(jinit_merged_upsampler)
#define jinit_phuff_decoder FOXIT_PREFIX(jinit_phuff_decoder)
+#define jinit_phuff_encoder FOXIT_PREFIX(jinit_phuff_encoder)
#define jinit_upsampler FOXIT_PREFIX(jinit_upsampler)
+#define jpeg_CreateCompress FOXIT_PREFIX(jpeg_CreateCompress)
#define jpeg_CreateDecompress FOXIT_PREFIX(jpeg_CreateDecompress)
#define jpeg_abort FOXIT_PREFIX(jpeg_abort)
+#define jpeg_abort_compress FOXIT_PREFIX(jpeg_abort_compress)
#define jpeg_abort_decompress FOXIT_PREFIX(jpeg_abort_decompress)
+#define jpeg_add_quant_table FOXIT_PREFIX(jpeg_add_quant_table)
#define jpeg_alloc_huff_table FOXIT_PREFIX(jpeg_alloc_huff_table)
#define jpeg_alloc_quant_table FOXIT_PREFIX(jpeg_alloc_quant_table)
#define jpeg_calc_output_dimensions FOXIT_PREFIX(jpeg_calc_output_dimensions)
#define jpeg_consume_input FOXIT_PREFIX(jpeg_consume_input)
+#define jpeg_default_colorspace FOXIT_PREFIX(jpeg_default_colorspace)
#define jpeg_destroy FOXIT_PREFIX(jpeg_destroy)
+#define jpeg_destroy_compress FOXIT_PREFIX(jpeg_destroy_compress)
#define jpeg_destroy_decompress FOXIT_PREFIX(jpeg_destroy_decompress)
+#define jpeg_fdct_ifast FOXIT_PREFIX(jpeg_fdct_ifast)
+#define jpeg_fdct_islow FOXIT_PREFIX(jpeg_fdct_islow)
#define jpeg_fill_bit_buffer FOXIT_PREFIX(jpeg_fill_bit_buffer)
+#define jpeg_finish_compress FOXIT_PREFIX(jpeg_finish_compress)
#define jpeg_finish_decompress FOXIT_PREFIX(jpeg_finish_decompress)
#define jpeg_finish_output FOXIT_PREFIX(jpeg_finish_output)
#define jpeg_free_large FOXIT_PREFIX(jpeg_free_large)
#define jpeg_free_small FOXIT_PREFIX(jpeg_free_small)
+#define jpeg_gen_optimal_table FOXIT_PREFIX(jpeg_gen_optimal_table)
#define jpeg_get_large FOXIT_PREFIX(jpeg_get_large)
#define jpeg_get_small FOXIT_PREFIX(jpeg_get_small)
#define jpeg_has_multiple_scans FOXIT_PREFIX(jpeg_has_multiple_scans)
@@ -58,6 +78,7 @@
#define jpeg_idct_ifast FOXIT_PREFIX(jpeg_idct_ifast)
#define jpeg_idct_islow FOXIT_PREFIX(jpeg_idct_islow)
#define jpeg_input_complete FOXIT_PREFIX(jpeg_input_complete)
+#define jpeg_make_c_derived_tbl FOXIT_PREFIX(jpeg_make_c_derived_tbl)
#define jpeg_make_d_derived_tbl FOXIT_PREFIX(jpeg_make_d_derived_tbl)
#define jpeg_mem_available FOXIT_PREFIX(jpeg_mem_available)
#define jpeg_mem_init FOXIT_PREFIX(jpeg_mem_init)
@@ -65,18 +86,32 @@
#define jpeg_natural_order FOXIT_PREFIX(jpeg_natural_order)
#define jpeg_new_colormap FOXIT_PREFIX(jpeg_new_colormap)
#define jpeg_open_backing_store FOXIT_PREFIX(jpeg_open_backing_store)
+#define jpeg_quality_scaling FOXIT_PREFIX(jpeg_quality_scaling)
#define jpeg_read_coefficients FOXIT_PREFIX(jpeg_read_coefficients)
#define jpeg_read_header FOXIT_PREFIX(jpeg_read_header)
#define jpeg_read_raw_data FOXIT_PREFIX(jpeg_read_raw_data)
#define jpeg_read_scanlines FOXIT_PREFIX(jpeg_read_scanlines)
#define jpeg_resync_to_restart FOXIT_PREFIX(jpeg_resync_to_restart)
#define jpeg_save_markers FOXIT_PREFIX(jpeg_save_markers)
+#define jpeg_set_colorspace FOXIT_PREFIX(jpeg_set_colorspace)
+#define jpeg_set_defaults FOXIT_PREFIX(jpeg_set_defaults)
+#define jpeg_set_linear_quality FOXIT_PREFIX(jpeg_set_linear_quality)
#define jpeg_set_marker_processor FOXIT_PREFIX(jpeg_set_marker_processor)
+#define jpeg_set_quality FOXIT_PREFIX(jpeg_set_quality)
+#define jpeg_simple_progression FOXIT_PREFIX(jpeg_simple_progression)
+#define jpeg_start_compress FOXIT_PREFIX(jpeg_start_compress)
#define jpeg_start_decompress FOXIT_PREFIX(jpeg_start_decompress)
#define jpeg_start_output FOXIT_PREFIX(jpeg_start_output)
#define jpeg_std_error FOXIT_PREFIX(jpeg_std_error)
#define jpeg_std_message_table FOXIT_PREFIX(jpeg_std_message_table)
#define jpeg_stdio_src FOXIT_PREFIX(jpeg_stdio_src)
+#define jpeg_suppress_tables FOXIT_PREFIX(jpeg_suppress_tables)
+#define jpeg_write_m_byte FOXIT_PREFIX(jpeg_write_m_byte)
+#define jpeg_write_m_header FOXIT_PREFIX(jpeg_write_m_header)
+#define jpeg_write_marker FOXIT_PREFIX(jpeg_write_marker)
+#define jpeg_write_raw_data FOXIT_PREFIX(jpeg_write_raw_data)
+#define jpeg_write_scanlines FOXIT_PREFIX(jpeg_write_scanlines)
+#define jpeg_write_tables FOXIT_PREFIX(jpeg_write_tables)
#define jround_up FOXIT_PREFIX(jround_up)
#define jzero_far FOXIT_PREFIX(jzero_far)
--- a/third_party/pdfium/third_party/libjpeg/jpeglib.h
+++ b/third_party/pdfium/third_party/libjpeg/jpeglib.h
@@ -20,33 +20,53 @@
#define jdiv_round_up FOXIT_PREFIX(jdiv_round_up)
#define jinit_1pass_quantizer FOXIT_PREFIX(jinit_1pass_quantizer)
#define jinit_2pass_quantizer FOXIT_PREFIX(jinit_2pass_quantizer)
+#define jinit_c_coef_controller FOXIT_PREFIX(jinit_c_coef_controller)
+#define jinit_c_main_controller FOXIT_PREFIX(jinit_c_main_controller)
+#define jinit_c_master_control FOXIT_PREFIX(jinit_c_master_control)
+#define jinit_c_prep_controller FOXIT_PREFIX(jinit_c_prep_controller)
+#define jinit_color_converter FOXIT_PREFIX(jinit_color_converter)
#define jinit_color_deconverter FOXIT_PREFIX(jinit_color_deconverter)
+#define jinit_compress_master FOXIT_PREFIX(jinit_compress_master)
#define jinit_d_coef_controller FOXIT_PREFIX(jinit_d_coef_controller)
#define jinit_d_main_controller FOXIT_PREFIX(jinit_d_main_controller)
#define jinit_d_post_controller FOXIT_PREFIX(jinit_d_post_controller)
+#define jinit_downsampler FOXIT_PREFIX(jinit_downsampler)
+#define jinit_forward_dct FOXIT_PREFIX(jinit_forward_dct)
#define jinit_huff_decoder FOXIT_PREFIX(jinit_huff_decoder)
+#define jinit_huff_encoder FOXIT_PREFIX(jinit_huff_encoder)
#define jinit_input_controller FOXIT_PREFIX(jinit_input_controller)
#define jinit_inverse_dct FOXIT_PREFIX(jinit_inverse_dct)
#define jinit_marker_reader FOXIT_PREFIX(jinit_marker_reader)
+#define jinit_marker_writer FOXIT_PREFIX(jinit_marker_writer)
#define jinit_master_decompress FOXIT_PREFIX(jinit_master_decompress)
#define jinit_memory_mgr FOXIT_PREFIX(jinit_memory_mgr)
#define jinit_merged_upsampler FOXIT_PREFIX(jinit_merged_upsampler)
#define jinit_phuff_decoder FOXIT_PREFIX(jinit_phuff_decoder)
+#define jinit_phuff_encoder FOXIT_PREFIX(jinit_phuff_encoder)
#define jinit_upsampler FOXIT_PREFIX(jinit_upsampler)
+#define jpeg_CreateCompress FOXIT_PREFIX(jpeg_CreateCompress)
#define jpeg_CreateDecompress FOXIT_PREFIX(jpeg_CreateDecompress)
#define jpeg_abort FOXIT_PREFIX(jpeg_abort)
+#define jpeg_abort_compress FOXIT_PREFIX(jpeg_abort_compress)
#define jpeg_abort_decompress FOXIT_PREFIX(jpeg_abort_decompress)
+#define jpeg_add_quant_table FOXIT_PREFIX(jpeg_add_quant_table)
#define jpeg_alloc_huff_table FOXIT_PREFIX(jpeg_alloc_huff_table)
#define jpeg_alloc_quant_table FOXIT_PREFIX(jpeg_alloc_quant_table)
#define jpeg_calc_output_dimensions FOXIT_PREFIX(jpeg_calc_output_dimensions)
#define jpeg_consume_input FOXIT_PREFIX(jpeg_consume_input)
+#define jpeg_default_colorspace FOXIT_PREFIX(jpeg_default_colorspace)
#define jpeg_destroy FOXIT_PREFIX(jpeg_destroy)
+#define jpeg_destroy_compress FOXIT_PREFIX(jpeg_destroy_compress)
#define jpeg_destroy_decompress FOXIT_PREFIX(jpeg_destroy_decompress)
+#define jpeg_fdct_ifast FOXIT_PREFIX(jpeg_fdct_ifast)
+#define jpeg_fdct_islow FOXIT_PREFIX(jpeg_fdct_islow)
#define jpeg_fill_bit_buffer FOXIT_PREFIX(jpeg_fill_bit_buffer)
+#define jpeg_finish_compress FOXIT_PREFIX(jpeg_finish_compress)
#define jpeg_finish_decompress FOXIT_PREFIX(jpeg_finish_decompress)
#define jpeg_finish_output FOXIT_PREFIX(jpeg_finish_output)
#define jpeg_free_large FOXIT_PREFIX(jpeg_free_large)
#define jpeg_free_small FOXIT_PREFIX(jpeg_free_small)
+#define jpeg_gen_optimal_table FOXIT_PREFIX(jpeg_gen_optimal_table)
#define jpeg_get_large FOXIT_PREFIX(jpeg_get_large)
#define jpeg_get_small FOXIT_PREFIX(jpeg_get_small)
#define jpeg_has_multiple_scans FOXIT_PREFIX(jpeg_has_multiple_scans)
@@ -58,6 +78,7 @@
#define jpeg_idct_ifast FOXIT_PREFIX(jpeg_idct_ifast)
#define jpeg_idct_islow FOXIT_PREFIX(jpeg_idct_islow)
#define jpeg_input_complete FOXIT_PREFIX(jpeg_input_complete)
+#define jpeg_make_c_derived_tbl FOXIT_PREFIX(jpeg_make_c_derived_tbl)
#define jpeg_make_d_derived_tbl FOXIT_PREFIX(jpeg_make_d_derived_tbl)
#define jpeg_mem_available FOXIT_PREFIX(jpeg_mem_available)
#define jpeg_mem_init FOXIT_PREFIX(jpeg_mem_init)
@@ -65,18 +86,32 @@
#define jpeg_natural_order FOXIT_PREFIX(jpeg_natural_order)
#define jpeg_new_colormap FOXIT_PREFIX(jpeg_new_colormap)
#define jpeg_open_backing_store FOXIT_PREFIX(jpeg_open_backing_store)
+#define jpeg_quality_scaling FOXIT_PREFIX(jpeg_quality_scaling)
#define jpeg_read_coefficients FOXIT_PREFIX(jpeg_read_coefficients)
#define jpeg_read_header FOXIT_PREFIX(jpeg_read_header)
#define jpeg_read_raw_data FOXIT_PREFIX(jpeg_read_raw_data)
#define jpeg_read_scanlines FOXIT_PREFIX(jpeg_read_scanlines)
#define jpeg_resync_to_restart FOXIT_PREFIX(jpeg_resync_to_restart)
#define jpeg_save_markers FOXIT_PREFIX(jpeg_save_markers)
+#define jpeg_set_colorspace FOXIT_PREFIX(jpeg_set_colorspace)
+#define jpeg_set_defaults FOXIT_PREFIX(jpeg_set_defaults)
+#define jpeg_set_linear_quality FOXIT_PREFIX(jpeg_set_linear_quality)
#define jpeg_set_marker_processor FOXIT_PREFIX(jpeg_set_marker_processor)
+#define jpeg_set_quality FOXIT_PREFIX(jpeg_set_quality)
+#define jpeg_simple_progression FOXIT_PREFIX(jpeg_simple_progression)
+#define jpeg_start_compress FOXIT_PREFIX(jpeg_start_compress)
#define jpeg_start_decompress FOXIT_PREFIX(jpeg_start_decompress)
#define jpeg_start_output FOXIT_PREFIX(jpeg_start_output)
#define jpeg_std_error FOXIT_PREFIX(jpeg_std_error)
#define jpeg_std_message_table FOXIT_PREFIX(jpeg_std_message_table)
#define jpeg_stdio_src FOXIT_PREFIX(jpeg_stdio_src)
+#define jpeg_suppress_tables FOXIT_PREFIX(jpeg_suppress_tables)
+#define jpeg_write_m_byte FOXIT_PREFIX(jpeg_write_m_byte)
+#define jpeg_write_m_header FOXIT_PREFIX(jpeg_write_m_header)
+#define jpeg_write_marker FOXIT_PREFIX(jpeg_write_marker)
+#define jpeg_write_raw_data FOXIT_PREFIX(jpeg_write_raw_data)
+#define jpeg_write_scanlines FOXIT_PREFIX(jpeg_write_scanlines)
+#define jpeg_write_tables FOXIT_PREFIX(jpeg_write_tables)
#define jround_up FOXIT_PREFIX(jround_up)
#define jzero_far FOXIT_PREFIX(jzero_far)

2
build_templates/debian/patches/system/nspr.patch
View File

@@ -2,7 +2,7 @@ Include system copy of prtime.h
--- a/base/base.gypi
+++ b/base/base.gypi
@@ -622,8 +622,6 @@
@@ -627,8 +627,6 @@
'third_party/dmg_fp/g_fmt.cc',
'third_party/icu/icu_utf.cc',
'third_party/icu/icu_utf.h',

7
build_templates/ubuntu/changelog
View File

@@ -1,3 +1,10 @@
chromium-browser (48.0.2564.82-1) wily; urgency=low
* New upstream version
- Based off of Debian's 48.0.2564.82-1
-- Eloston <eloston@mail.com> Fri, 22 Jan 2016 00:00:00 +0000
chromium-browser (47.0.2526.111-1) wily; urgency=low
* New upstream version

2
patches/debian/disable/default-browser-warning.patch
View File

@@ -2,7 +2,7 @@ description: never show the default browser question
--- a/chrome/browser/ui/startup/startup_browser_creator_impl.cc
+++ b/chrome/browser/ui/startup/startup_browser_creator_impl.cc
@@ -819,7 +819,7 @@ void StartupBrowserCreatorImpl::AddInfoB
@@ -814,7 +814,7 @@ void StartupBrowserCreatorImpl::AddInfoB
browser->tab_strip_model()->GetActiveWebContents()));
#if !defined(OS_CHROMEOS)

2
patches/debian/disable/google-api-warning.patch
View File

@@ -2,7 +2,7 @@ description: disable the google api key warning when those aren't found
--- a/chrome/browser/ui/startup/startup_browser_creator_impl.cc
+++ b/chrome/browser/ui/startup/startup_browser_creator_impl.cc
@@ -815,8 +815,6 @@ void StartupBrowserCreatorImpl::AddInfoB
@@ -810,8 +810,6 @@ void StartupBrowserCreatorImpl::AddInfoB
if (is_process_startup == chrome::startup::IS_PROCESS_STARTUP &&
!command_line_.HasSwitch(switches::kTestType)) {
chrome::ShowBadFlagsPrompt(browser);

2
patches/debian/gpu-timeout.patch
View File

@@ -4,7 +4,7 @@ bug-debian: http://bugs.debian.org/781940
--- a/content/gpu/gpu_main.cc
+++ b/content/gpu/gpu_main.cc
@@ -78,7 +78,7 @@
@@ -84,7 +84,7 @@
#if defined(CYGPROFILE_INSTRUMENTATION)
const int kGpuTimeout = 30000;
#else

24
patches/inox-patchset/disable-autofill-download-manager.patch
View File

@@ -1,6 +1,6 @@
--- ./components/autofill/core/browser/autofill_download_manager.cc
+++ ./components/autofill/core/browser/autofill_download_manager.cc.new
@@ -55,11 +55,6 @@
--- a/components/autofill/core/browser/autofill_download_manager.cc
+++ b/components/autofill/core/browser/autofill_download_manager.cc
@@ -56,11 +56,6 @@ std::string RequestTypeToString(AutofillDownloadManager::RequestType type) {
return std::string();
}
@@ -12,7 +12,7 @@
} // namespace
struct AutofillDownloadManager::FormRequestData {
@@ -188,35 +183,6 @@
@@ -190,46 +185,6 @@ void AutofillDownloadManager::SetNegativeUploadRate(double rate) {
bool AutofillDownloadManager::StartRequest(
const std::string& form_xml,
const FormRequestData& request_data) {
@@ -21,6 +21,16 @@
- DCHECK(request_context);
- GURL request_url = GetRequestUrl(request_data.request_type);
-
- std::string compressed_data;
- if (!compression::GzipCompress(form_xml, &compressed_data)) {
- NOTREACHED();
- return false;
- }
-
- AutofillMetrics::LogPayloadCompressionRatio(
- static_cast<int>(100 * compressed_data.size() / form_xml.size()),
- request_data.request_type);
-
- // Id is ignored for regular chrome, in unit test id's for fake fetcher
- // factory will be 0, 1, 2, ...
- net::URLFetcher* fetcher =
@@ -31,11 +41,12 @@
- url_fetchers_[fetcher] = request_data;
- fetcher->SetAutomaticallyRetryOn5xx(false);
- fetcher->SetRequestContext(request_context);
- fetcher->SetUploadData("text/plain", form_xml);
- fetcher->SetUploadData("text/xml", compressed_data);
- fetcher->SetLoadFlags(net::LOAD_DO_NOT_SAVE_COOKIES |
- net::LOAD_DO_NOT_SEND_COOKIES);
- // Add Chrome experiment state to the request headers.
- // Add Chrome experiment state and GZIP encoding to the request headers.
- net::HttpRequestHeaders headers;
- headers.SetHeaderIfMissing("content-encoding", "gzip");
- variations::VariationsHttpHeaderProvider::GetInstance()->AppendHeaders(
- fetcher->GetOriginalURL(), driver_->IsOffTheRecord(), false, &headers);
- fetcher->SetExtraRequestHeaders(headers.ToString());
@@ -48,4 +59,3 @@
return true;
}

19
patches/inox-patchset/disable-default-extensions.patch
View File

@@ -1,6 +1,6 @@
--- ./chrome/browser/extensions/external_component_loader.cc
+++ ./chrome/browser/extensions/external_component_loader.cc.new
@@ -35,30 +35,6 @@
--- a/chrome/browser/extensions/external_component_loader.cc
+++ b/chrome/browser/extensions/external_component_loader.cc
@@ -38,30 +38,6 @@ ExternalComponentLoader::~ExternalComponentLoader() {}
void ExternalComponentLoader::StartLoading() {
prefs_.reset(new base::DictionaryValue());
@@ -19,7 +19,7 @@
-#endif
-
-#if defined(ENABLE_MEDIA_ROUTER) && defined(GOOGLE_CHROME_BUILD)
- if (switches::MediaRouterEnabled())
- if (media_router::MediaRouterEnabled(profile_))
- AddExternalExtension(extension_misc::kMediaRouterStableExtensionId);
-#endif // defined(ENABLE_MEDIA_ROUTER) && defined(GOOGLE_CHROME_BUILD)
-
@@ -31,12 +31,9 @@
LoadFinished();
}
--- ./chrome/browser/extensions/component_loader.cc
+++ ./chrome/browser/extensions/component_loader.cc.new
@@ -351,10 +351,6 @@
@@ -352,10 +352,6 @@
}
void ComponentLoader::AddHangoutServicesExtension() {
@@ -47,7 +44,7 @@
}
void ComponentLoader::AddHotwordAudioVerificationApp() {
@@ -388,43 +388,6 @@
@@ -389,43 +389,6 @@
}
void ComponentLoader::AddGoogleNowExtension() {
@@ -91,7 +88,7 @@
}
#if defined(OS_CHROMEOS)
@@ -500,15 +451,6 @@
@@ -501,15 +452,6 @@
}
void ComponentLoader::AddWebStoreApp() {
@@ -107,7 +104,7 @@
}
scoped_refptr<const Extension> ComponentLoader::CreateExtension(
@@ -636,13 +578,6 @@
@@ -637,13 +579,6 @@
AddImageLoaderExtension();
AddGoogleNowExtension();

10
patches/inox-patchset/disable-first-run-behaviour.patch
View File

@@ -1,6 +1,6 @@
--- ./chrome/browser/ui/startup/startup_browser_creator_impl.cc
+++ ./chrome/browser/ui/startup/startup_browser_creator_impl.cc.new
@@ -852,8 +852,6 @@
@@ -846,8 +846,6 @@
// Replace magic names for the actual urls.
if (it->host() == "new_tab_page") {
startup_urls->push_back(GURL(chrome::kChromeUINewTabURL));
@@ -9,7 +9,7 @@
} else {
startup_urls->push_back(*it);
}
@@ -868,10 +866,6 @@
@@ -862,10 +860,6 @@
if (startup_urls->empty()) {
AddSpecialURLs(startup_urls);
startup_urls->push_back(GURL(chrome::kChromeUINewTabURL));
@@ -20,7 +20,7 @@
}
if (signin::ShouldShowPromoAtStartup(profile_, is_first_run_)) {
@@ -905,10 +899,6 @@
@@ -899,10 +893,6 @@
void StartupBrowserCreatorImpl::AddSpecialURLs(
std::vector<GURL>* url_list) const {
@@ -30,6 +30,4 @@
-
// If this Profile is marked for a reset prompt, ensure the reset
// settings dialog appears.
if (CheckAndClearProfileResetTrigger())
if (ProfileHasResetTrigger()) {

2
patches/inox-patchset/disable-new-avatar-menu.patch
View File

@@ -17,7 +17,7 @@
--- ./chrome/browser/ui/webui/options/browser_options_handler.cc
+++ ./chrome/browser/ui/webui/options/browser_options_handler.cc.new
@@ -1506,7 +1506,7 @@
@@ -1436,7 +1436,7 @@
SigninManagerBase* signin = SigninManagerFactory::GetForProfile(profile);
DCHECK(signin);
sync_status->SetBoolean("signoutAllowed", !signout_prohibited);

4
patches/inox-patchset/modify-default-prefs.patch
View File

@@ -1,6 +1,6 @@
--- ./components/autofill/core/browser/autofill_manager.cc
+++ ./components/autofill/core/browser/autofill_manager.cc.new
@@ -168,7 +168,7 @@ void AutofillManager::RegisterProfilePrefs(
@@ -172,7 +172,7 @@ void AutofillManager::RegisterProfilePrefs(
user_prefs::PrefRegistrySyncable* registry) {
registry->RegisterBooleanPref(
prefs::kAutofillEnabled,
@@ -13,7 +13,7 @@
--- ./chrome/browser/io_thread.cc
+++ ./chrome/browser/io_thread.cc.new
@@ -938,7 +938,7 @@
@@ -1015,7 +1015,7 @@
data_reduction_proxy::prefs::kDataReductionProxy, std::string());
registry->RegisterBooleanPref(prefs::kEnableReferrers, true);
data_reduction_proxy::RegisterPrefs(registry);

2
patches/inox-patchset/restore-classic-ntp.patch
View File

@@ -23,7 +23,7 @@
--- ./chrome/browser/ui/webui/ntp/new_tab_page_sync_handler.cc
+++ ./chrome/browser/ui/webui/ntp/new_tab_page_sync_handler.cc.new
@@ -90,14 +90,9 @@
@@ -91,14 +91,9 @@
SigninManagerBase* signin = SigninManagerFactory::GetForProfile(
Profile::FromWebUI(web_ui()));

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

@@ -194,7 +194,7 @@ diff --git a/chrome/browser/chromeos/login/signin/oauth2_login_manager.cc b/chro
index 5e046a4..10467c7 100644
--- a/chrome/browser/chromeos/login/signin/oauth2_login_manager.cc
+++ b/chrome/browser/chromeos/login/signin/oauth2_login_manager.cc
@@ -30,7 +30,7 @@ namespace chromeos {
@@ -31,7 +31,7 @@ namespace chromeos {
namespace {
static const char kServiceScopeGetUserInfo[] =
@@ -308,7 +308,7 @@ diff --git a/chrome/browser/plugins/plugin_infobar_delegates.cc b/chrome/browser
index 87e5fba..730c252 100644
--- a/chrome/browser/plugins/plugin_infobar_delegates.cc
+++ b/chrome/browser/plugins/plugin_infobar_delegates.cc
@@ -273,8 +273,8 @@ base::string16 PluginMetroModeInfoBarDelegate::GetLinkText() const {
@@ -277,8 +277,8 @@ base::string16 PluginMetroModeInfoBarDelegate::GetLinkText() const {
GURL PluginMetroModeInfoBarDelegate::GetLinkURL() const {
return GURL(
(mode_ == MISSING_PLUGIN)
@@ -388,7 +388,7 @@ diff --git a/chrome/browser/safe_browsing/srt_global_error_win.cc b/chrome/brows
index 5f1cd48..f81e694 100644
--- a/chrome/browser/safe_browsing/srt_global_error_win.cc
+++ b/chrome/browser/safe_browsing/srt_global_error_win.cc
@@ -34,7 +34,7 @@ namespace {
@@ -36,7 +36,7 @@ namespace {
// Used as a backup plan in case the SRT executable was not successfully
// downloaded or run.
const char kSRTDownloadURL[] =
@@ -440,7 +440,7 @@ diff --git a/chrome/browser/supervised_user/supervised_user_service.cc b/chrome/
index 1e2f005..8dfe102 100644
--- a/chrome/browser/supervised_user/supervised_user_service.cc
+++ b/chrome/browser/supervised_user/supervised_user_service.cc
@@ -78,7 +78,7 @@ namespace {
@@ -81,7 +81,7 @@ namespace {
// The URL from which to download a host blacklist if no local one exists yet.
const char kBlacklistURL[] =
@@ -467,18 +467,6 @@ index 1677b18..47446f4 100644
} // namespace
diff --git a/chrome/browser/ui/startup/obsolete_system_infobar_delegate.cc b/chrome/browser/ui/startup/obsolete_system_infobar_delegate.cc
index 379f62e..fab6b0b 100644
--- a/chrome/browser/ui/startup/obsolete_system_infobar_delegate.cc
+++ b/chrome/browser/ui/startup/obsolete_system_infobar_delegate.cc
@@ -58,6 +58,6 @@ GURL ObsoleteSystemInfoBarDelegate::GetLinkURL() const {
#if defined(OS_MACOSX)
return GURL(chrome::kMac32BitDeprecationURL);
#else
- return GURL("https://support.9oo91e.qjz9zk/chrome/answer/95411");
+ return GURL("trk:241:https://support.9oo91e.qjz9zk/chrome/answer/95411");
#endif
}
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
--- a/chrome/browser/ui/views/outdated_upgrade_bubble_view.cc
@@ -527,7 +515,7 @@ diff --git a/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc b/chrome/browser/
index 0fb8d9e..1ae1f91 100644
--- a/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc
+++ b/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc
@@ -77,17 +77,17 @@ namespace {
@@ -78,17 +78,17 @@ namespace {
// The URL for the the Learn More page shown on incognito new tab.
const char kLearnMoreIncognitoUrl[] =
#if defined(OS_CHROMEOS)
@@ -553,7 +541,7 @@ diff --git a/chrome/chrome_watcher/chrome_watcher_main.cc b/chrome/chrome_watche
index 6219bec..44c7bae 100644
--- a/chrome/chrome_watcher/chrome_watcher_main.cc
+++ b/chrome/chrome_watcher/chrome_watcher_main.cc
@@ -380,7 +380,7 @@ extern "C" int WatcherMain(const base::char16* registry_path,
@@ -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(),
@@ -595,20 +583,23 @@ diff --git a/chrome/common/localized_error.cc b/chrome/common/localized_error.cc
index 6fde4f5..14ecc17 100644
--- a/chrome/common/localized_error.cc
+++ b/chrome/common/localized_error.cc
@@ -45,7 +45,7 @@ const unsigned int kErrorPagesNoDetails = 0;
@@ -46,9 +46,9 @@ 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";
static const char kCachedCopyButtonFieldTrial[] =
- "https://support.9oo91e.qjz9zk/chrome?p=dh_error";
+ "trk:241: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
--- a/chrome/common/url_constants.cc
+++ b/chrome/common/url_constants.cc
@@ -302,7 +302,7 @@ const char kChromeUIVoiceSearchHost[] = "voicesearch";
@@ -304,7 +304,7 @@ const char kChromeUIVoiceSearchHost[] = "voicesearch";
const char kEULAPathFormat[] = "/usr/share/chromeos-assets/eula/%s/eula.html";
const char kOemEulaURLPath[] = "oem";
const char kOnlineEulaURLPath[] =
@@ -617,7 +608,7 @@ index df69fef..d65a9de 100644
const char kChromeOSCreditsPath[] =
"/opt/google/chrome/resources/about_os_credits.html";
@@ -363,7 +363,7 @@ const char kExtensionResourceInvalidRequestURL[] =
@@ -367,7 +367,7 @@ const char kExtensionResourceInvalidRequestURL[] =
"chrome-extension-resource://invalid/";
const char kSyncGoogleDashboardURL[] =
@@ -626,7 +617,7 @@ index df69fef..d65a9de 100644
const char kPasswordManagerLearnMoreURL[] =
#if defined(OS_CHROMEOS)
@@ -554,7 +554,7 @@ const char kCloudPrintLearnMoreURL[] =
@@ -559,7 +559,7 @@ const char kCloudPrintLearnMoreURL[] =
#endif
const char kCloudPrintNoDestinationsLearnMoreURL[] =
@@ -766,7 +757,7 @@ diff --git a/components/crash/content/app/breakpad_linux.cc b/components/crash/c
index f93dda7..ba0b28c 100644
--- a/components/crash/content/app/breakpad_linux.cc
+++ b/components/crash/content/app/breakpad_linux.cc
@@ -82,7 +82,7 @@ namespace breakpad {
@@ -83,7 +83,7 @@ namespace breakpad {
namespace {
#if !defined(OS_CHROMEOS)
@@ -930,7 +921,7 @@ diff --git a/components/password_manager/core/browser/password_store.cc b/compon
index 4eef17c..c63d484 100644
--- a/components/password_manager/core/browser/password_store.cc
+++ b/components/password_manager/core/browser/password_store.cc
@@ -140,10 +140,10 @@ void PasswordStore::GetLogins(const PasswordForm& form,
@@ -160,10 +160,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 &&
@@ -962,7 +953,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
index 273f7a8..a01734a 100644
--- a/components/policy/resources/policy_templates.json
+++ b/components/policy/resources/policy_templates.json
@@ -1843,7 +1843,7 @@
@@ -2005,7 +2005,7 @@
'dynamic_refresh': True,
'per_profile': True,
},
@@ -970,8 +961,8 @@ index 273f7a8..a01734a 100644
+ 'example_value': ['gbchcmhmhahfdphkhkmpfmihenigjmpp;trk:16:https://clients2.9oo91e.qjz9zk/service/update2/crx'],
'id': 34,
'caption': '''Configure the list of force-installed apps and extensions''',
'desc': '''
@@ -1885,7 +1885,7 @@
'tags': ['full-admin-access'],
@@ -2048,7 +2048,7 @@
URL indicated in the extension's manifest.
For example, <ph
@@ -980,7 +971,7 @@ index 273f7a8..a01734a 100644
installs the <ph name="EXTENSION_POLICY_EXAMPLE_EXTENSION_NAME">Chrome
Remote Desktop</ph> app from the standard Chrome Web Store "update"
URL. For more information about hosting extensions, see: <ph
@@ -4703,7 +4703,7 @@
@@ -5035,7 +5035,7 @@
'features': {
'dynamic_refresh': True,
},
@@ -988,7 +979,7 @@ index 273f7a8..a01734a 100644
+ 'example_value': [ { "extension-id": "khgabmflimjjbclkmljlpmgaleanedem", "update-url": "trk:18:https://clients2.9oo91e.qjz9zk/service/update2/crx" } ],
'id': 135,
'caption': '''List of AppPack extensions''',
'desc': '''This policy is active in retail mode only.
'tags': [],
diff --git a/components/rappor/rappor_service.cc b/components/rappor/rappor_service.cc
index e266232..548806a 100644
--- a/components/rappor/rappor_service.cc

4
patches/iridium-browser/autofill-disable-autofill-download-manager.patch
View File

@@ -13,7 +13,7 @@ diff --git a/components/autofill/core/browser/autofill_download_manager.cc b/com
index ffe6312..cb473de 100644
--- a/components/autofill/core/browser/autofill_download_manager.cc
+++ b/components/autofill/core/browser/autofill_download_manager.cc
@@ -56,7 +56,7 @@ std::string RequestTypeToString(AutofillDownloadManager::RequestType type) {
@@ -57,7 +57,7 @@ std::string RequestTypeToString(AutofillDownloadManager::RequestType type) {
}
GURL GetRequestUrl(AutofillDownloadManager::RequestType request_type) {
@@ -26,7 +26,7 @@ diff --git a/components/autofill/core/browser/autofill_manager.cc b/components/a
index 5443327..22064e3 100644
--- a/components/autofill/core/browser/autofill_manager.cc
+++ b/components/autofill/core/browser/autofill_manager.cc
@@ -153,10 +153,12 @@ AutofillManager::AutofillManager(
@@ -157,10 +157,12 @@ AutofillManager::AutofillManager(
external_delegate_(NULL),
test_delegate_(NULL),
weak_ptr_factory_(this) {

2
patches/iridium-browser/browser-disable-profile-auto-import-on-first-run.patch
View File

@@ -11,7 +11,7 @@ diff --git a/chrome/browser/chrome_browser_main.cc b/chrome/browser/chrome_brows
index ba4ce89..eacec8f 100644
--- a/chrome/browser/chrome_browser_main.cc
+++ b/chrome/browser/chrome_browser_main.cc
@@ -1456,11 +1456,13 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() {
@@ -1475,11 +1475,13 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() {
// preferences are registered, since some of the code that the importer
// touches reads preferences.
if (first_run::IsChromeFirstRun()) {

2
patches/iridium-browser/build-build-the-sandbox-with-PIE.patch
View File

@@ -13,7 +13,7 @@ diff --git a/sandbox/linux/sandbox_linux.gypi b/sandbox/linux/sandbox_linux.gypi
index 4df0f1b..7931969 100644
--- a/sandbox/linux/sandbox_linux.gypi
+++ b/sandbox/linux/sandbox_linux.gypi
@@ -221,7 +221,10 @@
@@ -205,7 +205,10 @@
],
'cflags': [
# For ULLONG_MAX

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

@@ -19,7 +19,7 @@ diff --git a/chrome/browser/extensions/component_loader.cc b/chrome/browser/exte
index e92e237..d4f347b 100644
--- a/chrome/browser/extensions/component_loader.cc
+++ b/chrome/browser/extensions/component_loader.cc
@@ -555,10 +555,12 @@ void ComponentLoader::AddDefaultComponentExtensions(
@@ -556,10 +556,12 @@ void ComponentLoader::AddDefaultComponentExtensions(
DCHECK(!skip_session_components);
Add(IDR_BOOKMARKS_MANIFEST,
base::FilePath(FILE_PATH_LITERAL("bookmark_manager")));
@@ -36,7 +36,7 @@ diff --git a/chrome/browser/ui/browser_ui_prefs.cc b/chrome/browser/ui/browser_u
index d9741ec..c4b2204 100644
--- a/chrome/browser/ui/browser_ui_prefs.cc
+++ b/chrome/browser/ui/browser_ui_prefs.cc
@@ -96,7 +96,7 @@ void RegisterBrowserUserPrefs(user_prefs::PrefRegistrySyncable* registry) {
@@ -97,7 +97,7 @@ void RegisterBrowserUserPrefs(user_prefs::PrefRegistrySyncable* registry) {
user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
registry->RegisterStringPref(prefs::kCloudPrintEmail, std::string());
registry->RegisterBooleanPref(prefs::kCloudPrintProxyEnabled, true);

6
patches/iridium-browser/first_run-barf-if-metrics_reporting-is-activated.patch
View File

@@ -21,9 +21,9 @@ index 6e97dd8..a5dc39b 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 @@
#include "chrome/installer/util/google_update_settings.h"
#include "chrome/installer/util/master_preferences.h"
#include "components/startup_metric_utils/startup_metric_utils.h"
#include "components/metrics/metrics_pref_names.h"
#include "components/startup_metric_utils/browser/startup_metric_utils.h"
+#include <cstdio>
namespace first_run {
@@ -32,7 +32,7 @@ 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, "*** metrics_reporting = 1\n");
+ fprintf(stderr, "***ungoogled-chromium custom message*** metrics_reporting = 1\n");
g_browser_process->local_state()->SetBoolean(
metrics::prefs::kMetricsReportingEnabled, true);
}

4
patches/iridium-browser/first_run-deactivate-autoupdate-globally.patch
View File

@@ -17,12 +17,12 @@ diff --git a/chrome/browser/extensions/extension_system_impl.cc b/chrome/browser
index bbf1452..694d435 100644
--- a/chrome/browser/extensions/extension_system_impl.cc
+++ b/chrome/browser/extensions/extension_system_impl.cc
@@ -149,6 +149,9 @@ void ExtensionSystemImpl::Shared::Init(bool extensions_enabled) {
@@ -150,6 +150,9 @@ void ExtensionSystemImpl::Shared::Init(bool extensions_enabled) {
bool autoupdate_enabled = !profile_->IsGuestSession() &&
!profile_->IsSystemProfile();
+ if (autoupdate_enabled)
+ fprintf(stderr, "*** autoupdate was enabled, overriding with false\n");
+ fprintf(stderr, "***ungoogled-chromium custom message*** autoupdate was enabled, overriding with false\n");
+ autoupdate_enabled = false;
#if defined(OS_CHROMEOS)
if (!extensions_enabled)

4
patches/iridium-browser/google_now-disable-this.patch
View File

@@ -18,7 +18,7 @@ diff --git a/build/common.gypi b/build/common.gypi
index 7c526c1..50b58ad 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -541,7 +541,7 @@
@@ -539,7 +539,7 @@
'enable_extensions%': 1,
# Enable Google Now.
@@ -31,7 +31,7 @@ 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
@@ -82,7 +82,7 @@ declare_args() {
@@ -83,7 +83,7 @@ declare_args() {
enable_autofill_dialog = !is_ios

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

@@ -27,7 +27,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
index ee23e48..91f92b5 100644
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -23,7 +23,8 @@ declare_args() {
@@ -24,7 +24,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.
@@ -41,7 +41,7 @@ diff --git a/chrome/browser/extensions/component_loader.cc b/chrome/browser/exte
index d4f347b..1e9b948 100644
--- a/chrome/browser/extensions/component_loader.cc
+++ b/chrome/browser/extensions/component_loader.cc
@@ -358,17 +358,21 @@ void ComponentLoader::AddHangoutServicesExtension() {
@@ -359,17 +359,21 @@ void ComponentLoader::AddHangoutServicesExtension() {
}
void ComponentLoader::AddHotwordAudioVerificationApp() {

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

@@ -129,7 +129,7 @@ diff --git a/chrome/browser/ui/browser_command_controller.cc b/chrome/browser/ui
index 395cdc9..ba793c7 100644
--- a/chrome/browser/ui/browser_command_controller.cc
+++ b/chrome/browser/ui/browser_command_controller.cc
@@ -103,7 +103,8 @@ bool HasInternalURL(const NavigationEntry* entry) {
@@ -105,7 +105,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.
@@ -143,7 +143,7 @@ diff --git a/chrome/browser/ui/browser_navigator.cc b/chrome/browser/ui/browser_
index d5573b1..65baf5c 100644
--- a/chrome/browser/ui/browser_navigator.cc
+++ b/chrome/browser/ui/browser_navigator.cc
@@ -623,6 +623,14 @@ bool IsURLAllowedInIncognito(const GURL& url,
@@ -624,6 +624,14 @@ bool IsURLAllowedInIncognito(const GURL& url,
return stripped_url.is_valid() &&
IsURLAllowedInIncognito(stripped_url, browser_context);
}
@@ -176,7 +176,7 @@ diff --git a/chrome/chrome_dll.gypi b/chrome/chrome_dll.gypi
index d246635..c8007cf 100644
--- a/chrome/chrome_dll.gypi
+++ b/chrome/chrome_dll.gypi
@@ -92,6 +92,7 @@
@@ -122,6 +122,7 @@
'app/delay_load_hook_win.h',
],
'dependencies': [
@@ -188,7 +188,7 @@ diff --git a/chrome/chrome_exe.gypi b/chrome/chrome_exe.gypi
index 6865227..8ed0547 100644
--- a/chrome/chrome_exe.gypi
+++ b/chrome/chrome_exe.gypi
@@ -196,6 +196,7 @@
@@ -197,6 +197,7 @@
'app/chrome_main_delegate.h',
],
'dependencies': [
@@ -515,7 +515,7 @@ index 03f3f02..ac61270 100644
namespace {
// Max number of http redirects to follow. Same number as gecko.
@@ -576,6 +578,11 @@ URLRequest::URLRequest(const GURL& url,
@@ -565,6 +567,11 @@ URLRequest::URLRequest(const GURL& url,
DCHECK(base::MessageLoop::current())
<< "The current base::MessageLoop must exist";
@@ -531,7 +531,7 @@ diff --git a/net/url_request/url_request.h b/net/url_request/url_request.h
index 9209697..37e9d6b 100644
--- a/net/url_request/url_request.h
+++ b/net/url_request/url_request.h
@@ -853,6 +853,8 @@ class NET_EXPORT URLRequest : NON_EXPORTED_BASE(public base::NonThreadSafe),
@@ -858,6 +858,8 @@ class NET_EXPORT URLRequest : NON_EXPORTED_BASE(public base::NonThreadSafe),
DISALLOW_COPY_AND_ASSIGN(URLRequest);
};

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

@@ -17,7 +17,7 @@ diff --git a/chrome/browser/ui/navigation_correction_tab_observer.cc b/chrome/br
index 6be6a9f..6acc08d 100644
--- a/chrome/browser/ui/navigation_correction_tab_observer.cc
+++ b/chrome/browser/ui/navigation_correction_tab_observer.cc
@@ -58,7 +58,7 @@ NavigationCorrectionTabObserver::~NavigationCorrectionTabObserver() {
@@ -56,7 +56,7 @@ NavigationCorrectionTabObserver::~NavigationCorrectionTabObserver() {
void NavigationCorrectionTabObserver::RegisterProfilePrefs(
user_prefs::PrefRegistrySyncable* prefs) {
prefs->RegisterBooleanPref(prefs::kAlternateErrorPagesEnabled,

2
patches/iridium-browser/prefs-disable-background-mode-by-default.patch
View File

@@ -13,7 +13,7 @@ diff --git a/chrome/browser/background/background_mode_manager.cc b/chrome/brows
index 5bd2c6c..465fe13 100644
--- a/chrome/browser/background/background_mode_manager.cc
+++ b/chrome/browser/background/background_mode_manager.cc
@@ -387,7 +387,7 @@ void BackgroundModeManager::RegisterPrefs(PrefRegistrySimple* registry) {
@@ -349,7 +349,7 @@ void BackgroundModeManager::RegisterPrefs(PrefRegistrySimple* registry) {
registry->RegisterBooleanPref(prefs::kChromeCreatedLoginItem, false);
registry->RegisterBooleanPref(prefs::kMigratedLoginItemPref, false);
#endif

2
patches/iridium-browser/prefs-disable-hyperlink-auditing.patch
View File

@@ -18,7 +18,7 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch
index e0a26c8..d7d7e07 100644
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -665,7 +665,7 @@ ChromeContentBrowserClient::~ChromeContentBrowserClient() {
@@ -688,7 +688,7 @@ ChromeContentBrowserClient::~ChromeContentBrowserClient() {
void ChromeContentBrowserClient::RegisterProfilePrefs(
user_prefs::PrefRegistrySyncable* registry) {
registry->RegisterBooleanPref(prefs::kDisable3DAPIs, false);

2
patches/iridium-browser/prefs-disable-translation-service.patch
View File

@@ -16,7 +16,7 @@ diff --git a/chrome/browser/ui/browser_ui_prefs.cc b/chrome/browser/ui/browser_u
index c4b2204..fa40ad3 100644
--- a/chrome/browser/ui/browser_ui_prefs.cc
+++ b/chrome/browser/ui/browser_ui_prefs.cc
@@ -92,7 +92,7 @@ void RegisterBrowserUserPrefs(user_prefs::PrefRegistrySyncable* registry) {
@@ -93,7 +93,7 @@ void RegisterBrowserUserPrefs(user_prefs::PrefRegistrySyncable* registry) {
registry->RegisterBooleanPref(prefs::kWebAppCreateInQuickLaunchBar, true);
registry->RegisterBooleanPref(
prefs::kEnableTranslate,

40
patches/iridium-browser/prefs-enable-Send-a-Do-Not-Track-header.patch
View File

@@ -1,40 +0,0 @@
From 6cb9014cba36bd4d626c11a79f2324fb1a42203a Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Sat, 13 Sep 2014 15:06:39 +0200
Subject: [PATCH 13/56] prefs: enable "Send a Do-Not-Track header"
Set enable_do_not_track to true by default.
The web community has pointed out (in e.g.
https://news.ycombinator.com/item?id=9483958 ) that defaulting to
DNT=on is "a questionable plan". I agree with that feeling
that DNT becomes useless if everybody has it on.
However, Iridium is order of magnitudes away from "everybody"
currently. We shall reevaluate this in time again.
[The same ycombinator post also quotes section 6.3 of the
https://tools.ietf.org/html/draft-mayer-do-not-track-00#section-6
draft: "It MUST NOT transmit OPT-IN without explicit user consent."
This is ok, because the UA is not sending OPT-IN; it is sending
OPT-OUT.]
---
chrome/browser/ui/browser_ui_prefs.cc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/chrome/browser/ui/browser_ui_prefs.cc b/chrome/browser/ui/browser_ui_prefs.cc
index 1b25184..d9741ec 100644
--- a/chrome/browser/ui/browser_ui_prefs.cc
+++ b/chrome/browser/ui/browser_ui_prefs.cc
@@ -109,7 +109,7 @@ void RegisterBrowserUserPrefs(user_prefs::PrefRegistrySyncable* registry) {
registry->RegisterBooleanPref(prefs::kImportSearchEngine, true);
registry->RegisterBooleanPref(
prefs::kEnableDoNotTrack,
- false,
+ true,
user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
#if defined(ENABLE_WEBRTC)
registry->RegisterBooleanPref(prefs::kWebRTCMultipleRoutesEnabled, true);
--
2.4.3

10
patches/iridium-browser/prefs-only-keep-cookies-until-exit.patch
View File

@@ -12,15 +12,15 @@ diff --git a/components/content_settings/core/browser/content_settings_registry.
index cfc4f65..7504eba 100644
--- a/components/content_settings/core/browser/content_settings_registry.cc
+++ b/components/content_settings/core/browser/content_settings_registry.cc
@@ -109,7 +109,7 @@ void ContentSettingsRegistry::Init() {
@@ -113,7 +113,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!
// Content settings (those with allow/block/ask/etc. values).
- Register(CONTENT_SETTINGS_TYPE_COOKIES, "cookies", CONTENT_SETTING_ALLOW,
+ Register(CONTENT_SETTINGS_TYPE_COOKIES, "cookies", CONTENT_SETTING_SESSION_ONLY,
WebsiteSettingsInfo::SYNCABLE, WhitelistedForWebUI());
Register(CONTENT_SETTINGS_TYPE_IMAGES, "images", CONTENT_SETTING_ALLOW,
WebsiteSettingsInfo::SYNCABLE, WhitelistedForWebUIAndExtensions());
WebsiteSettingsInfo::SYNCABLE,
WhitelistedSchemes(kChromeUIScheme, kChromeDevToolsScheme),
ValidSettings(CONTENT_SETTING_ALLOW, CONTENT_SETTING_BLOCK,
--
2.4.3

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

@@ -18,7 +18,7 @@ diff --git a/chrome/browser/resources/options/reset_profile_settings_overlay.htm
index b92c9fd..dadaad0 100644
--- a/chrome/browser/resources/options/reset_profile_settings_overlay.html
+++ b/chrome/browser/resources/options/reset_profile_settings_overlay.html
@@ -24,7 +24,7 @@
@@ -26,7 +26,7 @@
<div id="feedback-bar"
class="gray-bottom-bar checkbox controlled-setting-with-label">
<label>

2
patches/iridium-browser/promo-disable-Google-promotion-fetching.patch
View File

@@ -26,7 +26,7 @@ diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_pro
index fecf890..ae52be8 100644
--- a/chrome/browser/browser_process_impl.cc
+++ b/chrome/browser/browser_process_impl.cc
@@ -1082,7 +1082,9 @@ void BrowserProcessImpl::PreMainMessageLoopRun() {
@@ -1092,7 +1092,9 @@ void BrowserProcessImpl::PreMainMessageLoopRun() {
local_state(), chrome::GetChannel(), GetApplicationLocale(),
system_request_context(), switches::kDisableBackgroundNetworking,
base::Bind(safe_json::SafeJsonParser::Parse)));

20
patches/iridium-browser/safe_browsing-disable-cookie-transmission.patch
View File

@@ -45,7 +45,7 @@ diff --git a/chrome/browser/safe_browsing/download_protection_service.cc b/chrom
index 228894f..f126674 100644
--- a/chrome/browser/safe_browsing/download_protection_service.cc
+++ b/chrome/browser/safe_browsing/download_protection_service.cc
@@ -823,7 +823,9 @@ class DownloadProtectionService::CheckClientDownloadRequest
@@ -867,7 +867,9 @@ class DownloadProtectionService::CheckClientDownloadRequest
fetcher_ = net::URLFetcher::Create(0 /* ID used for testing */,
GetDownloadRequestUrl(),
net::URLFetcher::POST, this);
@@ -58,9 +58,9 @@ index 228894f..f126674 100644
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/malware_details_cache.cc
+++ b/chrome/browser/safe_browsing/malware_details_cache.cc
@@ -82,7 +82,8 @@ void MalwareDetailsCacheCollector::OpenEntry() {
--- 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 |
@@ -74,9 +74,9 @@ diff --git a/chrome/browser/safe_browsing/protocol_manager.cc b/chrome/browser/s
index 0be2eb2..dd464f8 100644
--- a/chrome/browser/safe_browsing/protocol_manager.cc
+++ b/chrome/browser/safe_browsing/protocol_manager.cc
@@ -224,7 +224,9 @@ void SafeBrowsingProtocolManager::GetFullHash(
@@ -223,7 +223,9 @@ void SafeBrowsingProtocolManager::GetFullHash(
const std::string get_hash = safe_browsing::FormatGetHash(prefixes);
const std::string get_hash = FormatGetHash(prefixes);
- fetcher->SetLoadFlags(net::LOAD_DISABLE_CACHE);
+ fetcher->SetLoadFlags(net::LOAD_DISABLE_CACHE |
@@ -85,7 +85,7 @@ index 0be2eb2..dd464f8 100644
fetcher->SetRequestContext(request_context_getter_.get());
fetcher->SetUploadData("text/plain", get_hash);
fetcher->Start();
@@ -598,7 +600,9 @@ bool SafeBrowsingProtocolManager::IssueBackupUpdateRequest(
@@ -587,7 +589,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 +96,7 @@ index 0be2eb2..dd464f8 100644
request_->SetRequestContext(request_context_getter_.get());
request_->SetUploadData("text/plain", update_list_data_);
request_->Start();
@@ -625,7 +629,9 @@ void SafeBrowsingProtocolManager::IssueChunkRequest() {
@@ -614,7 +618,9 @@ void SafeBrowsingProtocolManager::IssueChunkRequest() {
request_type_ = CHUNK_REQUEST;
request_ = net::URLFetcher::Create(url_fetcher_id_++, chunk_url,
net::URLFetcher::GET, this);
@@ -107,7 +107,7 @@ index 0be2eb2..dd464f8 100644
request_->SetRequestContext(request_context_getter_.get());
chunk_request_start_ = base::Time::Now();
request_->Start();
@@ -678,7 +684,9 @@ void SafeBrowsingProtocolManager::OnGetChunksComplete(
@@ -665,7 +671,9 @@ void SafeBrowsingProtocolManager::OnGetChunksComplete(
GURL update_url = UpdateUrl(is_extended_reporting);
request_ = net::URLFetcher::Create(url_fetcher_id_++, update_url,
net::URLFetcher::POST, this);
@@ -122,7 +122,7 @@ diff --git a/chrome/browser/safe_browsing/srt_fetcher_win.cc b/chrome/browser/sa
index e21be25..b3bc395 100644
--- a/chrome/browser/safe_browsing/srt_fetcher_win.cc
+++ b/chrome/browser/safe_browsing/srt_fetcher_win.cc
@@ -181,7 +181,9 @@ class SRTFetcher : public net::URLFetcherDelegate {
@@ -220,7 +220,9 @@ class SRTFetcher : public net::URLFetcherDelegate {
GURL(GetSRTDownloadURL()),
net::URLFetcher::GET,
this)) {

37
patches/iridium-browser/safe_browsing-disable-incident-reporting.patch
View File

@@ -30,7 +30,7 @@ diff --git a/chrome/browser/safe_browsing/incident_reporting/incident_reporting_
index 9dc0c27..35fbcd4 100644
--- a/chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.cc
+++ b/chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.cc
@@ -284,6 +284,8 @@ IncidentReportingService::UploadContext::~UploadContext() {
@@ -285,6 +285,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))
@@ -292,6 +294,7 @@ bool IncidentReportingService::IsEnabledForProfile(Profile* profile) {
@@ -293,6 +295,7 @@ bool IncidentReportingService::IsEnabledForProfile(Profile* profile) {
return true;
return profile->GetPrefs()->GetBoolean(
prefs::kSafeBrowsingExtendedReportingEnabled);
@@ -51,37 +51,46 @@ diff --git a/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc b/chrom
index 342e59d..ddac6f2 100644
--- a/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc
+++ b/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc
@@ -56,17 +56,17 @@ namespace {
@@ -58,17 +58,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";
@@ -616,6 +616,7 @@ void SafeBrowsingBlockingPage::PopulateInterstitialStrings(
@@ -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(
void SafeBrowsingBlockingPage::PopulateExtendedReportingOption(
base::DictionaryValue* load_time_data) {
+#if 0
// Only show checkbox if !(HTTPS || incognito-mode).
const bool show = CanShowMalwareDetailsOption();
const bool show = CanShowThreatDetailsOption();
load_time_data->SetBoolean(interstitials::kDisplayCheckBox, show);
@@ -632,6 +633,7 @@ void SafeBrowsingBlockingPage::PopulateExtendedReportingOption(
@@ -646,6 +647,7 @@ void SafeBrowsingBlockingPage::PopulateExtendedReportingOption(
load_time_data->SetBoolean(
interstitials::kBoxChecked,
IsPrefEnabled(prefs::kSafeBrowsingExtendedReportingEnabled));
@@ -93,14 +102,14 @@ diff --git a/chrome/browser/safe_browsing/safe_browsing_service.cc b/chrome/brow
index d01f175..835107e 100644
--- a/chrome/browser/safe_browsing/safe_browsing_service.cc
+++ b/chrome/browser/safe_browsing/safe_browsing_service.cc
@@ -400,9 +400,11 @@ SafeBrowsingService::CreateIncidentReportingService() {
@@ -398,9 +398,11 @@ SafeBrowsingService::CreateIncidentReportingService() {
void SafeBrowsingService::RegisterAllDelayedAnalysis() {
#if defined(FULL_SAFE_BROWSING)
+#if 0
safe_browsing::RegisterBinaryIntegrityAnalysis();
safe_browsing::RegisterBlacklistLoadAnalysis();
safe_browsing::RegisterVariationsSeedSignatureAnalysis();
RegisterBinaryIntegrityAnalysis();
RegisterBlacklistLoadAnalysis();
RegisterVariationsSeedSignatureAnalysis();
+#endif
#else
NOTREACHED();

5
patches/iridium-browser/safe_browsing-support-trk-prefix.patch
View File

@@ -11,14 +11,13 @@ diff --git a/chrome/browser/safe_browsing/protocol_manager.cc b/chrome/browser/s
index 054d5e1..0be2eb2 100644
--- a/chrome/browser/safe_browsing/protocol_manager.cc
+++ b/chrome/browser/safe_browsing/protocol_manager.cc
@@ -782,12 +782,14 @@ GURL SafeBrowsingProtocolManager::GetHashUrl(bool is_extended_reporting) const {
@@ -762,11 +762,13 @@ GURL SafeBrowsingProtocolManager::GetHashUrl(bool is_extended_reporting) const {
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) &&
if (!base::StartsWith(url, "http://", base::CompareCase::INSENSITIVE_ASCII) &&
!base::StartsWith(url, "https://",
base::CompareCase::INSENSITIVE_ASCII)) {
// Use https if we updated via https, otherwise http (useful for testing).

6
patches/iridium-browser/translate-disable-fetching-of-translate-languages-fr.patch
View File

@@ -25,8 +25,8 @@ index a9ce331..0253f77 100644
+#endif
// Represent if the language list updater is disabled.
bool update_is_disabled = false;
@@ -200,6 +202,7 @@ GURL TranslateLanguageList::TranslateLanguageUrl() {
// Android does not handle well language updates, leading to bugs
@@ -207,6 +209,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;
@@ -229,6 +232,7 @@ void TranslateLanguageList::RequestLanguageList() {
@@ -236,6 +239,7 @@ void TranslateLanguageList::RequestLanguageList() {
if (!result)
NotifyEvent(__LINE__, "Request is omitted due to retry limit");
}

1
patches/patch_order
View File

@@ -8,7 +8,6 @@ iridium-browser/mime_util-force-text-x-suse-ymp-to-be-downloaded.patch
iridium-browser/autofill-disable-autofill-download-manager.patch
iridium-browser/prefs-disable-Use-a-web-service-to-help-resolve-navi.patch
iridium-browser/prefs-disable-Use-a-prediction-service-to-help-compl.patch
iridium-browser/prefs-enable-Send-a-Do-Not-Track-header.patch
iridium-browser/prefs-disable-network-DNS-prediction.patch
iridium-browser/prefs-block-third-party-cookies-by-default.patch
iridium-browser/cloud-print-disable-in-prefs-and-component-loader.patch

26
patches/ungoogled-chromium/clear-http-auth-cache-menu-item.patch
View File

@@ -2,7 +2,7 @@ description: Adds a menu item under "More tools" to clear the HTTP authenticatio
--- a/chrome/app/chrome_command_ids.h
+++ b/chrome/app/chrome_command_ids.h
@@ -188,6 +188,7 @@
@@ -189,6 +189,7 @@
#define IDC_DEV_TOOLS_INSPECT 40023
#define IDC_UPGRADE_DIALOG 40024
#define IDC_VIEW_INCOMPATIBILITIES 40025
@@ -12,7 +12,7 @@ description: Adds a menu item under "More tools" to clear the HTTP authenticatio
#define IDC_BOOKMARKS_MENU 40029
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -1446,6 +1446,9 @@ Psst! Incognito mode <ph name="SHORTCUT_KEY">$1<ex>(Ctrl+Shift+N)</ex></ph> may
@@ -1472,6 +1472,9 @@ Psst! Incognito mode <ph name="SHORTCUT_KEY">$1<ex>(Ctrl+Shift+N)</ex></ph> may
<message name="IDS_CLEAR_BROWSING_DATA" desc="The text label for the menu item for clearing of browsing data">
&amp;Clear browsing data...
</message>
@@ -22,7 +22,7 @@ description: Adds a menu item under "More tools" to clear the HTTP authenticatio
<message name="IDS_SHOW_DOWNLOADS" desc="The show downloads menu in the app menu">
&amp;Downloads
</message>
@@ -1484,6 +1487,9 @@ Psst! Incognito mode <ph name="SHORTCUT_KEY">$1<ex>(Ctrl+Shift+N)</ex></ph> may
@@ -1510,6 +1513,9 @@ Psst! Incognito mode <ph name="SHORTCUT_KEY">$1<ex>(Ctrl+Shift+N)</ex></ph> may
<message name="IDS_CLEAR_BROWSING_DATA" desc="In Title Case: The text label for the menu item for clearing of browsing data">
&amp;Clear Browsing Data...
</message>
@@ -32,9 +32,9 @@ description: Adds a menu item under "More tools" to clear the HTTP authenticatio
<message name="IDS_SHOW_DOWNLOADS" desc="In Title Case: The show downloads menu in the app menu">
&amp;Downloads
</message>
--- a/chrome/browser/ui/toolbar/wrench_menu_model.cc
+++ b/chrome/browser/ui/toolbar/wrench_menu_model.cc
@@ -315,6 +315,7 @@ void ToolsMenuModel::Build(Browser* browser) {
--- a/chrome/browser/ui/toolbar/app_menu_model.cc
+++ b/chrome/browser/ui/toolbar/app_menu_model.cc
@@ -309,6 +309,7 @@ void ToolsMenuModel::Build(Browser* browser) {
AddSeparator(ui::NORMAL_SEPARATOR);
AddItemWithStringId(IDC_CLEAR_BROWSING_DATA, IDS_CLEAR_BROWSING_DATA);
@@ -42,7 +42,7 @@ description: Adds a menu item under "More tools" to clear the HTTP authenticatio
AddItemWithStringId(IDC_MANAGE_EXTENSIONS, IDS_SHOW_EXTENSIONS);
if (chrome::CanOpenTaskManager())
AddItemWithStringId(IDC_TASK_MANAGER, IDS_TASK_MANAGER);
@@ -611,6 +612,13 @@ void WrenchMenuModel::LogMenuMetrics(int command_id) {
@@ -602,6 +603,13 @@ void AppMenuModel::LogMenuMetrics(int command_id) {
}
LogMenuAction(MENU_ACTION_CLEAR_BROWSING_DATA);
break;
@@ -56,9 +56,9 @@ description: Adds a menu item under "More tools" to clear the HTTP authenticatio
case IDC_VIEW_SOURCE:
if (!uma_action_recorded_)
UMA_HISTOGRAM_MEDIUM_TIMES("WrenchMenu.TimeToAction.ViewSource", delta);
--- a/chrome/browser/ui/toolbar/wrench_menu_model.h
+++ b/chrome/browser/ui/toolbar/wrench_menu_model.h
@@ -52,6 +52,7 @@ enum WrenchMenuAction {
--- a/chrome/browser/ui/toolbar/app_menu_model.h
+++ b/chrome/browser/ui/toolbar/app_menu_model.h
@@ -52,6 +52,7 @@ enum AppMenuAction {
MENU_ACTION_MANAGE_EXTENSIONS,
MENU_ACTION_TASK_MANAGER,
MENU_ACTION_CLEAR_BROWSING_DATA,
@@ -78,7 +78,7 @@ description: Adds a menu item under "More tools" to clear the HTTP authenticatio
--- a/chrome/browser/ui/browser_command_controller.cc
+++ b/chrome/browser/ui/browser_command_controller.cc
@@ -43,6 +43,9 @@
@@ -45,6 +45,9 @@
#include "content/public/common/url_constants.h"
#include "extensions/browser/extension_system.h"
#include "ui/events/keycodes/keyboard_codes.h"
@@ -88,7 +88,7 @@ description: Adds a menu item under "More tools" to clear the HTTP authenticatio
#if defined(OS_MACOSX)
#include "chrome/browser/ui/browser_commands_mac.h"
@@ -744,6 +747,9 @@ void BrowserCommandController::ExecuteCommandWithDisposition(
@@ -755,6 +758,9 @@ void BrowserCommandController::ExecuteCommandWithDisposition(
case IDC_CLEAR_BROWSING_DATA:
ShowClearBrowsingDataDialog(browser_);
break;
@@ -98,7 +98,7 @@ description: Adds a menu item under "More tools" to clear the HTTP authenticatio
case IDC_IMPORT_SETTINGS:
ShowImportDialog(browser_);
break;
@@ -978,6 +984,7 @@ void BrowserCommandController::InitCommandState() {
@@ -986,6 +992,7 @@ void BrowserCommandController::InitCommandState() {
!guest_session &&
!profile()->IsOffTheRecord());
command_updater_.UpdateCommandEnabled(IDC_CLEAR_BROWSING_DATA, normal_window);

2
patches/ungoogled-chromium/disable-crash-reporter.patch
View File

@@ -13,7 +13,7 @@ description: Disable some background communication with clients2.google.com
--- a/chrome/browser/tracing/crash_service_uploader.cc
+++ b/chrome/browser/tracing/crash_service_uploader.cc
@@ -126,6 +126,7 @@ void TraceCrashServiceUploader::DoUploadOnFileThread(
scoped_ptr<base::DictionaryValue> metadata,
scoped_ptr<const base::DictionaryValue> metadata,
const UploadProgressCallback& progress_callback,
const UploadDoneCallback& done_callback) {
+ return;

4
patches/ungoogled-chromium/disable-google-host-detection.patch
View File

@@ -2,7 +2,7 @@ description: Disables HasGoogleHost in net_util, google_util domain checking fun
--- a/net/base/net_util.cc
+++ b/net/base/net_util.cc
@@ -607,28 +607,6 @@ bool IsLocalhostTLD(base::StringPiece host) {
@@ -568,28 +568,6 @@ bool IsLocalhostTLD(base::StringPiece host) {
}
bool HasGoogleHost(const GURL& url) {
@@ -95,7 +95,7 @@ description: Disables HasGoogleHost in net_util, google_util domain checking fun
bool IsGoogleSearchResultURL(const GURL& url) {
--- a/chrome/renderer/page_load_histograms.cc
+++ b/chrome/renderer/page_load_histograms.cc
@@ -181,6 +181,7 @@ bool ViaHeaderContains(WebFrame* frame, const std::string& via_value) {
@@ -187,6 +187,7 @@ bool ViaHeaderContains(WebFrame* frame, const std::string& via_value) {
// purposes.
// TODO(pmeenan): Remove the fuzzy logic when the referrer is reliable
bool IsFromGoogleSearchResult(const GURL& url, const GURL& referrer) {

10
patches/ungoogled-chromium/disable-omnibox-searching.patch
View File

@@ -107,7 +107,7 @@ description: Disables searching in the omnibox, hides search options, and disabl
<span id="default-search-engine-label"
--- a/chrome/browser/ui/chrome_pages.cc
+++ b/chrome/browser/ui/chrome_pages.cc
@@ -342,8 +342,6 @@ void ShowAboutChrome(Browser* browser) {
@@ -352,8 +352,6 @@ void ShowAboutChrome(Browser* browser) {
}
void ShowSearchEngineSettings(Browser* browser) {
@@ -118,14 +118,14 @@ description: Disables searching in the omnibox, hides search options, and disabl
#if !defined(OS_ANDROID) && !defined(OS_IOS)
--- a/chrome/browser/prefs/chrome_pref_service_factory.cc
+++ b/chrome/browser/prefs/chrome_pref_service_factory.cc
@@ -39,7 +39,6 @@
@@ -38,7 +38,6 @@
#include "components/component_updater/pref_names.h"
#include "components/pref_registry/pref_registry_syncable.h"
#include "components/search_engines/default_search_manager.h"
-#include "components/search_engines/default_search_pref_migration.h"
#include "components/search_engines/search_engines_pref_names.h"
#include "components/signin/core/common/signin_pref_names.h"
#include "components/sync_driver/pref_names.h"
#include "components/syncable_prefs/pref_model_associator.h"
@@ -527,8 +526,6 @@ scoped_ptr<PrefServiceSyncable> CreateProfilePrefs(
scoped_ptr<syncable_prefs::PrefServiceSyncable> pref_service =
factory.CreateSyncable(pref_registry.get());
@@ -137,7 +137,7 @@ description: Disables searching in the omnibox, hides search options, and disabl
--- a/components/search_engines.gypi
+++ b/components/search_engines.gypi
@@ -41,8 +41,6 @@
@@ -42,8 +42,6 @@
'search_engines/default_search_manager.h',
'search_engines/default_search_policy_handler.cc',
'search_engines/default_search_policy_handler.h',
@@ -148,7 +148,7 @@ description: Disables searching in the omnibox, hides search options, and disabl
'search_engines/keyword_web_data_service.cc',
--- a/components/search_engines/template_url_service.cc
+++ b/components/search_engines/template_url_service.cc
@@ -1909,6 +1909,8 @@ bool TemplateURLService::ApplyDefaultSearchChangeNoMetrics(
@@ -1976,6 +1976,8 @@ bool TemplateURLService::ApplyDefaultSearchChangeNoMetrics(
bool TemplateURLService::AddNoNotify(TemplateURL* template_url,
bool newly_adding) {
DCHECK(template_url);

14
patches/ungoogled-chromium/disable-persistent-site-properties.patch
View File

@@ -2,9 +2,9 @@ description: Disables saving site properties to the Preferences file, including
--- a/net/http/http_server_properties_manager.cc
+++ b/net/http/http_server_properties_manager.cc
@@ -966,8 +966,6 @@ void HttpServerPropertiesManager::UpdatePrefsOnPrefThread(
SaveSupportsQuicToPrefs(last_quic_address, &http_server_properties_dict);
@@ -1063,8 +1063,6 @@ void HttpServerPropertiesManager::UpdatePrefsOnPrefThread(
SaveQuicServerInfoMapToServerPrefs(quic_server_info_map,
&http_server_properties_dict);
- setting_prefs_ = true;
- pref_service_->Set(path_, http_server_properties_dict);
@@ -81,7 +81,7 @@ description: Disables saving site properties to the Preferences file, including
if (client_->IsMergeableListPreference(name))
--- a/components/content_settings/core/browser/content_settings_pref.cc
+++ b/components/content_settings/core/browser/content_settings_pref.cc
@@ -89,7 +89,7 @@ bool ContentSettingsPref::SetWebsiteSetting(
@@ -109,7 +109,7 @@ bool ContentSettingsPref::SetWebsiteSetting(
// Update in memory value map.
OriginIdentifierValueMap* map_to_modify = &incognito_value_map_;
@@ -90,7 +90,7 @@ description: Disables saving site properties to the Preferences file, including
map_to_modify = &value_map_;
{
@@ -110,7 +110,7 @@ bool ContentSettingsPref::SetWebsiteSetting(
@@ -130,7 +130,7 @@ bool ContentSettingsPref::SetWebsiteSetting(
}
}
// Update the content settings preference.
@@ -99,7 +99,7 @@ description: Disables saving site properties to the Preferences file, including
UpdatePref(primary_pattern,
secondary_pattern,
resource_identifier,
@@ -156,6 +156,7 @@ void ContentSettingsPref::UpdateLastUsage(
@@ -176,6 +176,7 @@ void ContentSettingsPref::UpdateLastUsage(
const ContentSettingsPattern& primary_pattern,
const ContentSettingsPattern& secondary_pattern,
base::Clock* clock) {
@@ -107,7 +107,7 @@ description: Disables saving site properties to the Preferences file, including
// Don't write if in incognito.
if (is_incognito_) {
return;
@@ -224,6 +225,7 @@ bool ContentSettingsPref::TryLockForTesting() const {
@@ -244,6 +245,7 @@ bool ContentSettingsPref::TryLockForTesting() const {
}
void ContentSettingsPref::ReadContentSettingsFromPref() {

6
patches/ungoogled-chromium/disable-signin.patch
View File

@@ -2,7 +2,7 @@ description: Disables browser sign-in
--- a/components/signin/core/browser/signin_manager.cc
+++ b/components/signin/core/browser/signin_manager.cc
@@ -256,7 +256,7 @@ void SigninManager::OnGoogleServicesUsernamePatternChanged() {
@@ -255,7 +255,7 @@ void SigninManager::OnGoogleServicesUsernamePatternChanged() {
}
bool SigninManager::IsSigninAllowed() const {
@@ -37,7 +37,7 @@ description: Disables browser sign-in
// Shows either the help app or the appropriate help page for |source|. If
// |browser| is NULL and the help page is used (vs the app), the help page is
// shown in the last active browser. If there is no such browser, a new browser
@@ -346,6 +346,7 @@ void ShowSearchEngineSettings(Browser* browser) {
@@ -356,6 +356,7 @@ void ShowSearchEngineSettings(Browser* browser) {
#if !defined(OS_ANDROID) && !defined(OS_IOS)
void ShowBrowserSignin(Browser* browser, signin_metrics::Source source) {
@@ -45,7 +45,7 @@ description: Disables browser sign-in
Profile* original_profile = browser->profile()->GetOriginalProfile();
SigninManagerBase* manager =
SigninManagerFactory::GetForProfile(original_profile);
@@ -383,6 +384,7 @@ void ShowBrowserSignin(Browser* browser, signin_metrics::Source source) {
@@ -393,6 +394,7 @@ void ShowBrowserSignin(Browser* browser, signin_metrics::Source source) {
NavigateToSingletonTab(browser, GURL(signin::GetPromoURL(source, false)));
DCHECK_GT(browser->tab_strip_model()->count(), 0);
}

6
patches/ungoogled-chromium/disable-translate.patch
View File

@@ -12,7 +12,7 @@ description: Disables browser translation
if (!language_state_.page_needs_translation() ||
--- a/components/translate/content/renderer/translate_helper.cc
+++ b/components/translate/content/renderer/translate_helper.cc
@@ -85,6 +85,7 @@ scoped_ptr<translate::RendererCldDataProvider> CreateDataProvider(
@@ -83,6 +83,7 @@ scoped_ptr<translate::RendererCldDataProvider> CreateDataProvider(
// should not be translated.
// TODO(dglazkov): This logic should be moved into Blink.
bool HasNoTranslateMeta(WebDocument* document) {
@@ -20,7 +20,7 @@ description: Disables browser translation
WebElement head = document->head();
if (head.isNull() || !head.hasChildNodes())
return false;
@@ -143,7 +143,10 @@ TranslateHelper::TranslateHelper(content::RenderFrame* render_frame,
@@ -140,7 +140,10 @@ TranslateHelper::TranslateHelper(content::RenderFrame* render_frame,
world_id_(world_id),
extension_group_(extension_group),
extension_scheme_(extension_scheme),
@@ -32,7 +32,7 @@ description: Disables browser translation
TranslateHelper::~TranslateHelper() {
CancelPendingTranslation();
@@ -394,6 +397,7 @@ void TranslateHelper::OnTranslatePage(int page_seq_no,
@@ -391,6 +394,7 @@ void TranslateHelper::OnTranslatePage(int page_seq_no,
const std::string& translate_script,
const std::string& source_lang,
const std::string& target_lang) {

2
patches/ungoogled-chromium/disable-unload-javascript-dialog-box.patch
View File

@@ -2,7 +2,7 @@ description: Disables JavaScript dialog boxes that prompt when one tries to clos
--- a/components/app_modal/javascript_dialog_manager.cc
+++ b/components/app_modal/javascript_dialog_manager.cc
@@ -121,6 +121,8 @@ void JavaScriptDialogManager::RunBeforeUnloadDialog(
@@ -122,6 +122,8 @@ void JavaScriptDialogManager::RunBeforeUnloadDialog(
const base::string16& message_text,
bool is_reload,
const DialogClosedCallback& callback) {

2
patches/ungoogled-chromium/disable-untraceable-urls.patch
View File

@@ -52,7 +52,7 @@ description: Disable additional URLs that are not caught by the "trk" scheme
weak_factory_(this) {
--- a/chrome/browser/safe_browsing/client_side_model_loader.h
+++ b/chrome/browser/safe_browsing/client_side_model_loader.h
@@ -45,7 +45,6 @@ class ModelLoader : public net::URLFetcherDelegate {
@@ -44,7 +44,6 @@ class ModelLoader : public net::URLFetcherDelegate {
static const int kClientModelFetchIntervalMs;
static const char kClientModelFinchExperiment[];
static const char kClientModelFinchParam[];

61
patches/ungoogled-chromium/fix-building-without-safebrowsing.patch
View File

@@ -2,7 +2,7 @@ description: Fix building with safe browsing disabled
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -565,10 +565,10 @@ class SafeBrowsingSSLCertReporter : public SSLCertReporter {
@@ -570,10 +570,10 @@ class SafeBrowsingSSLCertReporter : public SSLCertReporter {
// SSLCertReporter implementation
void ReportInvalidCertificateChain(
const std::string& serialized_report) override {
@@ -15,15 +15,15 @@ description: Fix building with safe browsing disabled
+ // serialized_report, base::Bind(&base::DoNothing));
+ //}
}
private:
@@ -1943,11 +1943,11 @@ void ChromeContentBrowserClient::AllowCertificateError(
@@ -1991,11 +1991,11 @@ void ChromeContentBrowserClient::AllowCertificateError(
if (expired_previous_decision)
options_mask |= SSLBlockingPage::EXPIRED_BUT_PREVIOUSLY_ALLOWED;
- SafeBrowsingService* safe_browsing_service =
- safe_browsing::SafeBrowsingService* safe_browsing_service =
- g_browser_process->safe_browsing_service();
+ //SafeBrowsingService* safe_browsing_service =
+ //safe_browsing::SafeBrowsingService* safe_browsing_service =
+ // g_browser_process->safe_browsing_service();
scoped_ptr<SafeBrowsingSSLCertReporter> cert_reporter(
- new SafeBrowsingSSLCertReporter(safe_browsing_service
@@ -35,17 +35,17 @@ description: Fix building with safe browsing disabled
options_mask, cert_reporter.Pass(), callback);
--- a/chrome/browser/profiles/profile_impl.cc
+++ b/chrome/browser/profiles/profile_impl.cc
@@ -446,12 +446,12 @@ ProfileImpl::ProfileImpl(
@@ -451,12 +451,12 @@ ProfileImpl::ProfileImpl(
path_, sequenced_task_runner, create_mode == CREATE_MODE_SYNCHRONOUS);
#endif
- scoped_refptr<SafeBrowsingService> safe_browsing_service(
- scoped_refptr<safe_browsing::SafeBrowsingService> safe_browsing_service(
- g_browser_process->safe_browsing_service());
- if (safe_browsing_service.get()) {
- pref_validation_delegate_ =
- safe_browsing_service->CreatePreferenceValidationDelegate(this).Pass();
- }
+ //scoped_refptr<SafeBrowsingService> safe_browsing_service(
+ //scoped_refptr<safe_browsing::SafeBrowsingService> safe_browsing_service(
+ // g_browser_process->safe_browsing_service());
+ //if (safe_browsing_service.get()) {
+ // pref_validation_delegate_ =
@@ -56,7 +56,7 @@ description: Fix building with safe browsing disabled
prefs_ = chrome_prefs::CreateProfilePrefs(
--- a/chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc
+++ b/chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc
@@ -319,8 +319,8 @@ void ChromeResourceDispatcherHostDelegate::RequestBeginning(
@@ -322,8 +322,8 @@ void ChromeResourceDispatcherHostDelegate::RequestBeginning(
content::AppCacheService* appcache_service,
ResourceType resource_type,
ScopedVector<content::ResourceThrottle>* throttles) {
@@ -75,10 +75,10 @@ description: Fix building with safe browsing disabled
}
-
+/*
SafeBrowsingBlockingPage* CreateSafeBrowsingBlockingPage(
safe_browsing::SafeBrowsingBlockingPage* CreateSafeBrowsingBlockingPage(
content::WebContents* web_contents) {
SBThreatType threat_type = SB_THREAT_TYPE_URL_MALWARE;
@@ -215,7 +215,7 @@ SafeBrowsingBlockingPage* CreateSafeBrowsingBlockingPage(
safe_browsing::SBThreatType threat_type =
@@ -216,7 +216,7 @@ safe_browsing::SafeBrowsingBlockingPage* CreateSafeBrowsingBlockingPage(
web_contents,
resource);
}
@@ -87,7 +87,7 @@ description: Fix building with safe browsing disabled
#if defined(ENABLE_CAPTIVE_PORTAL_DETECTION)
CaptivePortalBlockingPage* CreateCaptivePortalBlockingPage(
content::WebContents* web_contents) {
@@ -304,9 +304,11 @@ void InterstitialHTMLSource::StartDataRequest(
@@ -305,9 +305,11 @@ void InterstitialHTMLSource::StartDataRequest(
scoped_ptr<content::InterstitialPageDelegate> interstitial_delegate;
if (base::StartsWith(path, "ssl", base::CompareCase::SENSITIVE)) {
interstitial_delegate.reset(CreateSSLBlockingPage(web_contents_));
@@ -133,22 +133,24 @@ description: Fix building with safe browsing disabled
SendRequest(id);
}
@@ -79,10 +79,10 @@ void BlacklistStateFetcher::SendRequest(const std::string& id) {
@@ -79,11 +79,11 @@ void BlacklistStateFetcher::SendRequest(const std::string& id) {
fetcher->Start();
}
-void BlacklistStateFetcher::SetSafeBrowsingConfig(
- const SafeBrowsingProtocolConfig& config) {
- safe_browsing_config_.reset(new SafeBrowsingProtocolConfig(config));
- const safe_browsing::SafeBrowsingProtocolConfig& config) {
- safe_browsing_config_.reset(
- new safe_browsing::SafeBrowsingProtocolConfig(config));
-}
+//void BlacklistStateFetcher::SetSafeBrowsingConfig(
+// const SafeBrowsingProtocolConfig& config) {
+// safe_browsing_config_.reset(new SafeBrowsingProtocolConfig(config));
+// const safe_browsing::SafeBrowsingProtocolConfig& config) {
+// safe_browsing_config_.reset(
+// new safe_browsing::SafeBrowsingProtocolConfig(config));
+//}
void BlacklistStateFetcher::SetURLRequestContextForTest(
net::URLRequestContextGetter* request_context) {
@@ -90,6 +90,7 @@ void BlacklistStateFetcher::SetURLRequestContextForTest(
@@ -91,6 +91,7 @@ void BlacklistStateFetcher::SetURLRequestContextForTest(
}
GURL BlacklistStateFetcher::RequestUrl() const {
@@ -156,11 +158,10 @@ description: Fix building with safe browsing disabled
std::string url = base::StringPrintf(
"%s/%s?client=%s&appver=%s&pver=2.2",
safe_browsing_config_->url_prefix.c_str(),
@@ -101,7 +102,8 @@ GURL BlacklistStateFetcher::RequestUrl() const {
base::StringAppendF(&url, "&key=%s",
@@ -103,6 +104,8 @@ GURL BlacklistStateFetcher::RequestUrl() const {
net::EscapeQueryParamValue(api_key, true).c_str());
}
- return GURL(url);
return GURL(url);
+ */
+ return GURL();
}
@@ -168,21 +169,23 @@ description: Fix building with safe browsing disabled
void BlacklistStateFetcher::OnURLFetchComplete(const net::URLFetcher* source) {
--- a/chrome/browser/extensions/blacklist_state_fetcher.h
+++ b/chrome/browser/extensions/blacklist_state_fetcher.h
@@ -32,7 +32,7 @@ class BlacklistStateFetcher : public net::URLFetcherDelegate {
@@ -32,8 +32,8 @@ class BlacklistStateFetcher : public net::URLFetcherDelegate {
virtual void Request(const std::string& id, const RequestCallback& callback);
- void SetSafeBrowsingConfig(const SafeBrowsingProtocolConfig& config);
+ //void SetSafeBrowsingConfig(const SafeBrowsingProtocolConfig& config);
- void SetSafeBrowsingConfig(
- const safe_browsing::SafeBrowsingProtocolConfig& config);
+ //void SetSafeBrowsingConfig(
+ // const safe_browsing::SafeBrowsingProtocolConfig& config);
void SetURLRequestContextForTest(
net::URLRequestContextGetter* request_context);
@@ -51,7 +51,7 @@ class BlacklistStateFetcher : public net::URLFetcherDelegate {
@@ -52,7 +52,7 @@ class BlacklistStateFetcher : public net::URLFetcherDelegate {
// ID for URLFetchers for testing.
int url_fetcher_id_;
- scoped_ptr<SafeBrowsingProtocolConfig> safe_browsing_config_;
+ //scoped_ptr<SafeBrowsingProtocolConfig> safe_browsing_config_;
- scoped_ptr<safe_browsing::SafeBrowsingProtocolConfig> safe_browsing_config_;
+ //scoped_ptr<safe_browsing::SafeBrowsingProtocolConfig> safe_browsing_config_;
scoped_refptr<net::URLRequestContextGetter> url_request_context_getter_;
scoped_refptr<net::URLRequestContextGetter> parent_request_context_for_test_;

4
patches/ungoogled-chromium/popups-to-tabs.patch
View File

@@ -2,7 +2,7 @@ description: Make popups go to tabs instead
--- a/content/renderer/render_view_impl.cc
+++ b/content/renderer/render_view_impl.cc
@@ -346,7 +346,7 @@ WindowOpenDisposition RenderViewImpl::NavigationPolicyToDisposition(
@@ -344,7 +344,7 @@ WindowOpenDisposition RenderViewImpl::NavigationPolicyToDisposition(
case blink::WebNavigationPolicyNewWindow:
return NEW_WINDOW;
case blink::WebNavigationPolicyNewPopup:
@@ -13,7 +13,7 @@ description: Make popups go to tabs instead
return IGNORE_ACTION;
--- a/chrome/browser/ui/views/frame/browser_view.cc
+++ b/chrome/browser/ui/views/frame/browser_view.cc
@@ -1536,7 +1536,7 @@ void BrowserView::Paste() {
@@ -1553,7 +1553,7 @@ void BrowserView::Paste() {
WindowOpenDisposition BrowserView::GetDispositionForPopupBounds(
const gfx::Rect& bounds) {

2
patches/ungoogled-chromium/remove-disable-setuid-sandbox-as-bad-flag.patch
View File

@@ -2,7 +2,7 @@ description: Remove the "--disable-setuid-sandbox" command line flag as a bad fl
--- a/chrome/browser/ui/startup/bad_flags_prompt.cc
+++ b/chrome/browser/ui/startup/bad_flags_prompt.cc
@@ -42,7 +42,7 @@ void ShowBadFlagsPrompt(Browser* browser) {
@@ -43,7 +43,7 @@ void ShowBadFlagsPrompt(Browser* browser) {
// These flags disable sandbox-related security.
switches::kDisableGpuSandbox,
switches::kDisableSeccompFilterSandbox,