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

patches/ungoogled: Update for 70

Browse Source
This commit is contained in:
xsmile
2018-10-04 21:58:11 +02:00
parent 6dd02c043e
commit 8955fe4997
28 changed files with 165 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
patches/ungoogled-chromium/add-flag-for-search-engine-collection.patch
View File

@@ -2,7 +2,7 @@
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -1226,6 +1226,10 @@ const FeatureEntry kFeatureEntries[] = {
@@ -1373,6 +1373,10 @@ const FeatureEntry kFeatureEntries[] = {
"Enable stacking in tab strip",
"Forces tabs to be stacked in the tab strip. Otherwise, they follow default behavior.",
kOsAll, SINGLE_VALUE_TYPE("enable-stacked-tab-strip")},
@@ -27,7 +27,7 @@
if (!command_line.HasSwitch(switches::kDisableClientSidePhishingDetection))
SetClientSidePhishingDetection(true);
#endif
@@ -332,14 +333,16 @@ void ChromeRenderFrameObserver::DidFinis
@@ -338,14 +339,16 @@ void ChromeRenderFrameObserver::DidFinis
if (frame->Parent())
return;
@@ -54,7 +54,7 @@
--- a/chrome/renderer/chrome_render_frame_observer.h
+++ b/chrome/renderer/chrome_render_frame_observer.h
@@ -99,6 +99,7 @@ class ChromeRenderFrameObserver : public
@@ -105,6 +105,7 @@ class ChromeRenderFrameObserver : public
// Have the same lifetime as us.
translate::TranslateHelper* translate_helper_;
safe_browsing::PhishingClassifierDelegate* phishing_classifier_;

6
patches/ungoogled-chromium/add-flag-to-configure-extension-downloading.patch
View File

@@ -3,7 +3,7 @@
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -198,6 +198,16 @@ const unsigned kOsDesktop = kOsMac | kOs
@@ -201,6 +201,16 @@ const unsigned kOsDesktop = kOsMac | kOs
const unsigned kOsAura = kOsWin | kOsLinux | kOsCrOS;
#endif // USE_AURA
@@ -18,9 +18,9 @@
+};
+
const FeatureEntry::Choice kTouchEventFeatureDetectionChoices[] = {
{flags_ui::kGenericExperimentChoiceAutomatic, "", ""},
{flags_ui::kGenericExperimentChoiceDisabled, "", ""},
{flags_ui::kGenericExperimentChoiceEnabled,
@@ -1208,6 +1218,10 @@ const FeatureEntry::FeatureVariation kGa
@@ -1355,6 +1365,10 @@ const FeatureEntry::FeatureVariation kOf
//
// When adding a new choice, add it to the end of the list.
const FeatureEntry kFeatureEntries[] = {

8
patches/ungoogled-chromium/add-flag-to-enable-potentially-annoying-security-features.patch
View File

@@ -1,6 +1,6 @@
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -2085,11 +2085,11 @@ const FeatureEntry kFeatureEntries[] = {
@@ -2246,11 +2246,11 @@ const FeatureEntry kFeatureEntries[] = {
{"enable-wifi-credential-sync", flag_descriptions::kWifiCredentialSyncName,
flag_descriptions::kWifiCredentialSyncDescription, kOsCrOS,
SINGLE_VALUE_TYPE(switches::kEnableWifiCredentialSync)},
@@ -10,6 +10,6 @@
flag_descriptions::kExperimentalSecurityFeaturesDescription, kOsAll,
SINGLE_VALUE_TYPE(switches::kEnablePotentiallyAnnoyingSecurityFeatures)},
-#endif // OS_CHROMEOS
{"committed-interstitials", flag_descriptions::kCommittedInterstitialsName,
flag_descriptions::kCommittedInterstitialsDescription, kOsAll,
SINGLE_VALUE_TYPE(switches::kCommittedInterstitials)},
{"ssl-committed-interstitials",
flag_descriptions::kSSLCommittedInterstitialsName,
flag_descriptions::kSSLCommittedInterstitialsDescription, kOsAll,

8
patches/ungoogled-chromium/add-flag-to-force-punycode-hostnames.patch
View File

@@ -2,7 +2,7 @@
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -1230,6 +1230,10 @@ const FeatureEntry kFeatureEntries[] = {
@@ -1377,6 +1377,10 @@ const FeatureEntry kFeatureEntries[] = {
"Disable search engine collection",
"Prevents search engines from being added automatically.",
kOsAll, SINGLE_VALUE_TYPE("disable-search-engine-collection")},
@@ -23,13 +23,15 @@
#include "base/lazy_instance.h"
#include "base/macros.h"
#include "base/numerics/safe_conversions.h"
@@ -255,6 +256,11 @@ base::string16 IDNToUnicodeWithAdjustmen
@@ -250,6 +251,13 @@ IDNConversionResult IDNToUnicodeWithAdju
input16.reserve(host.length());
input16.insert(input16.end(), host.begin(), host.end());
+ if (base::CommandLine::ForCurrentProcess()->HasSwitch("force-punycode-hostnames")) {
+ // Leave as punycode.
+ return input16;
+ IDNConversionResult result;
+ result.result = input16;
+ return result;
+ }
+
bool is_tld_ascii = true;

2
patches/ungoogled-chromium/add-flag-to-stack-tabs.patch
View File

@@ -22,7 +22,7 @@
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -1208,6 +1208,10 @@ const FeatureEntry::FeatureVariation kGa
@@ -1355,6 +1355,10 @@ const FeatureEntry::FeatureVariation kOf
//
// When adding a new choice, add it to the end of the list.
const FeatureEntry kFeatureEntries[] = {

6
patches/ungoogled-chromium/add-ipv6-probing-option.patch
View File

@@ -3,7 +3,7 @@
--- a/net/dns/host_resolver_impl.cc
+++ b/net/dns/host_resolver_impl.cc
@@ -26,6 +26,7 @@
@@ -28,6 +28,7 @@
#include "base/bind_helpers.h"
#include "base/callback.h"
#include "base/callback_helpers.h"
@@ -11,7 +11,7 @@
#include "base/compiler_specific.h"
#include "base/containers/linked_list.h"
#include "base/debug/debugger.h"
@@ -108,11 +109,6 @@ const unsigned kMinimumTTLSeconds = kCac
@@ -110,11 +111,6 @@ const unsigned kMinimumTTLSeconds = kCac
// cached.
const int kIPv6ProbePeriodMs = 1000;
@@ -23,7 +23,7 @@
// We use a separate histogram name for each platform to facilitate the
// display of error codes by their symbolic name (since each platform has
// different mappings).
@@ -2399,7 +2395,7 @@ bool HostResolverImpl::IsIPv6Reachable(c
@@ -2641,7 +2637,7 @@ bool HostResolverImpl::IsIPv6Reachable(c
if ((tick_clock_->NowTicks() - last_ipv6_probe_time_).InMilliseconds() >
kIPv6ProbePeriodMs) {
last_ipv6_probe_result_ =

14
patches/ungoogled-chromium/block-trk-and-subdomains.patch
View File

@@ -85,7 +85,7 @@
#if BUILDFLAG(ENABLE_REPORTING)
#include "net/network_error_logging/network_error_logging_service.h"
@@ -597,6 +599,12 @@ URLRequest::URLRequest(const GURL& url,
@@ -598,6 +600,12 @@ URLRequest::URLRequest(const GURL& url,
// Sanity check out environment.
DCHECK(base::ThreadTaskRunnerHandle::IsSet());
@@ -133,7 +133,7 @@
return GURL(parts.scheme.is_valid() ? text : FixupPath(text));
--- a/net/BUILD.gn
+++ b/net/BUILD.gn
@@ -1649,6 +1649,8 @@ component("net") {
@@ -1646,6 +1646,8 @@ component("net") {
"url_request/report_sender.h",
"url_request/static_http_user_agent_settings.cc",
"url_request/static_http_user_agent_settings.h",
@@ -144,7 +144,7 @@
"url_request/url_fetcher_core.cc",
--- a/android_webview/browser/net/aw_url_request_context_getter.cc
+++ b/android_webview/browser/net/aw_url_request_context_getter.cc
@@ -58,6 +58,7 @@
@@ -60,6 +60,7 @@
#include "net/ssl/ssl_config_service.h"
#include "net/url_request/data_protocol_handler.h"
#include "net/url_request/file_protocol_handler.h"
@@ -152,7 +152,7 @@
#include "net/url_request/url_request_context.h"
#include "net/url_request/url_request_context_builder.h"
#include "net/url_request/url_request_intercepting_job_factory.h"
@@ -132,6 +133,9 @@ std::unique_ptr<net::URLRequestJobFactor
@@ -134,6 +135,9 @@ std::unique_ptr<net::URLRequestJobFactor
url::kDataScheme, std::make_unique<net::DataProtocolHandler>());
DCHECK(set_protocol);
set_protocol = aw_job_factory->SetProtocolHandler(
@@ -164,7 +164,7 @@
DCHECK(set_protocol);
--- a/chrome/browser/profiles/profile_io_data.cc
+++ b/chrome/browser/profiles/profile_io_data.cc
@@ -95,6 +95,7 @@
@@ -100,6 +100,7 @@
#include "net/url_request/data_protocol_handler.h"
#include "net/url_request/file_protocol_handler.h"
#include "net/url_request/ftp_protocol_handler.h"
@@ -172,7 +172,7 @@
#include "net/url_request/url_request.h"
#include "net/url_request/url_request_context.h"
#include "net/url_request/url_request_context_builder.h"
@@ -1209,6 +1210,9 @@ ProfileIOData::SetUpJobFactoryDefaults(
@@ -1228,6 +1229,9 @@ ProfileIOData::SetUpJobFactoryDefaults(
set_protocol = job_factory->SetProtocolHandler(
url::kDataScheme, std::make_unique<net::DataProtocolHandler>());
DCHECK(set_protocol);
@@ -277,7 +277,7 @@
#include "net/url_request/url_request_context.h"
#include "net/url_request/url_request_context_storage.h"
#include "net/url_request/url_request_intercepting_job_factory.h"
@@ -601,6 +602,8 @@ std::unique_ptr<URLRequestContext> URLRe
@@ -613,6 +614,8 @@ std::unique_ptr<URLRequestContext> URLRe
if (data_enabled_)
job_factory->SetProtocolHandler(url::kDataScheme,
std::make_unique<DataProtocolHandler>());

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

@@ -2,7 +2,7 @@
--- a/chrome/app/chrome_command_ids.h
+++ b/chrome/app/chrome_command_ids.h
@@ -152,6 +152,7 @@
@@ -148,6 +148,7 @@
#define IDC_MANAGE_EXTENSIONS 40022
#define IDC_DEV_TOOLS_INSPECT 40023
#define IDC_UPGRADE_DIALOG 40024
@@ -34,7 +34,7 @@
</message>
--- a/chrome/browser/ui/toolbar/app_menu_model.cc
+++ b/chrome/browser/ui/toolbar/app_menu_model.cc
@@ -211,6 +211,7 @@ void ToolsMenuModel::Build(Browser* brow
@@ -206,6 +206,7 @@ void ToolsMenuModel::Build(Browser* brow
AddSeparator(ui::NORMAL_SEPARATOR);
AddItemWithStringId(IDC_CLEAR_BROWSING_DATA, IDS_CLEAR_BROWSING_DATA);
@@ -42,7 +42,7 @@
AddItemWithStringId(IDC_MANAGE_EXTENSIONS, IDS_SHOW_EXTENSIONS);
if (chrome::CanOpenTaskManager())
AddItemWithStringId(IDC_TASK_MANAGER, IDS_TASK_MANAGER);
@@ -471,6 +472,13 @@ void AppMenuModel::LogMenuMetrics(int co
@@ -465,6 +466,13 @@ void AppMenuModel::LogMenuMetrics(int co
}
LogMenuAction(MENU_ACTION_CLEAR_BROWSING_DATA);
break;
@@ -68,7 +68,7 @@
--- a/chrome/browser/ui/views/frame/global_menu_bar_x11.cc
+++ b/chrome/browser/ui/views/frame/global_menu_bar_x11.cc
@@ -225,6 +225,7 @@ GlobalMenuBarCommand tools_menu[] = {
@@ -228,6 +228,7 @@ GlobalMenuBarCommand tools_menu[] = {
{IDS_TASK_MANAGER, IDC_TASK_MANAGER},
{IDS_CLEAR_BROWSING_DATA, IDC_CLEAR_BROWSING_DATA},
@@ -78,7 +78,7 @@
--- a/chrome/browser/ui/browser_command_controller.cc
+++ b/chrome/browser/ui/browser_command_controller.cc
@@ -61,6 +61,9 @@
@@ -62,6 +62,9 @@
#include "extensions/browser/extension_system.h"
#include "printing/buildflags/buildflags.h"
#include "ui/events/keycodes/keyboard_codes.h"
@@ -88,7 +88,7 @@
#if defined(OS_MACOSX)
#include "chrome/browser/ui/browser_commands_mac.h"
@@ -633,6 +636,9 @@ bool BrowserCommandController::ExecuteCo
@@ -643,6 +646,9 @@ bool BrowserCommandController::ExecuteCo
case IDC_CLEAR_BROWSING_DATA:
ShowClearBrowsingDataDialog(browser_);
break;
@@ -98,17 +98,17 @@
case IDC_IMPORT_SETTINGS:
ShowImportDialog(browser_);
break;
@@ -879,6 +885,7 @@ void BrowserCommandController::InitComma
@@ -891,6 +897,7 @@ void BrowserCommandController::InitComma
!profile()->IsOffTheRecord());
command_updater_.UpdateCommandEnabled(IDC_CLEAR_BROWSING_DATA,
!guest_session);
+ command_updater_.UpdateCommandEnabled(IDC_CLEAR_HTTP_AUTH_CACHE, true);
command_updater_.UpdateCommandEnabled(IDC_TOGGLE_CONFIRM_TO_QUIT_OPTION,
true);
#if defined(OS_CHROMEOS)
command_updater_.UpdateCommandEnabled(IDC_TAKE_SCREENSHOT, true);
#else
--- a/tools/metrics/histograms/histograms.xml
+++ b/tools/metrics/histograms/histograms.xml
@@ -127591,6 +127591,7 @@ uploading your change for review.
@@ -131296,6 +131296,7 @@ uploading your change for review.
<suffix name="Cast"/>
<suffix name="ChromeOSRestart"/>
<suffix name="ClearBrowsingData"/>
@@ -142,7 +142,7 @@
void ClearEntriesAddedSince(base::Time begin_time);
--- a/tools/metrics/histograms/enums.xml
+++ b/tools/metrics/histograms/enums.xml
@@ -51061,6 +51061,7 @@ Full version information for the fingerp
@@ -52360,6 +52360,7 @@ Full version information for the fingerp
<int value="48" label="Open in Chrome"/>
<int value="49" label="Site Settings"/>
<int value="50" label="App Info"/>

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

@@ -12,12 +12,12 @@
if (!CheckForRequiredFlagsOrDie()) {
--- a/chrome/browser/tracing/crash_service_uploader.cc
+++ b/chrome/browser/tracing/crash_service_uploader.cc
@@ -127,11 +127,16 @@ void TraceCrashServiceUploader::DoUpload
@@ -131,11 +131,16 @@ void TraceCrashServiceUploader::DoUpload
progress_callback_ = progress_callback;
done_callback_ = std::move(done_callback);
- base::PostTaskWithTraits(
- FROM_HERE, {base::TaskPriority::BACKGROUND},
- FROM_HERE, {base::TaskPriority::BEST_EFFORT},
- base::Bind(&TraceCrashServiceUploader::DoCompressOnBackgroundThread,
- base::Unretained(this), file_contents, upload_mode,
- upload_url_, base::Passed(std::move(metadata))));
@@ -34,23 +34,23 @@
}
void TraceCrashServiceUploader::DoCompressOnBackgroundThread(
@@ -202,11 +207,6 @@ void TraceCrashServiceUploader::DoCompre
@@ -206,11 +211,6 @@ void TraceCrashServiceUploader::DoCompre
std::string post_data;
SetupMultipart(product, version, std::move(metadata), "trace.json.gz",
compressed_contents, &post_data);
-
- content::BrowserThread::PostTask(
- content::BrowserThread::UI, FROM_HERE,
- base::Bind(&TraceCrashServiceUploader::CreateAndStartURLFetcher,
- base::Unretained(this), upload_url, post_data));
- base::BindOnce(&TraceCrashServiceUploader::CreateAndStartURLLoader,
- base::Unretained(this), upload_url, post_data));
}
void TraceCrashServiceUploader::OnUploadError(
@@ -304,6 +304,7 @@ bool TraceCrashServiceUploader::Compress
void TraceCrashServiceUploader::CreateAndStartURLFetcher(
@@ -308,6 +308,7 @@ bool TraceCrashServiceUploader::Compress
void TraceCrashServiceUploader::CreateAndStartURLLoader(
const std::string& upload_url,
const std::string& post_data) {
+ return;
DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
DCHECK(!url_fetcher_.get());
DCHECK(!simple_url_loader_);

6
patches/ungoogled-chromium/disable-download-quarantine.patch
View File

@@ -2,7 +2,7 @@
--- a/content/browser/renderer_host/pepper/pepper_file_io_host.cc
+++ b/content/browser/renderer_host/pepper/pepper_file_io_host.cc
@@ -440,7 +440,7 @@ void PepperFileIOHost::OnLocalFileOpened
@@ -439,7 +439,7 @@ void PepperFileIOHost::OnLocalFileOpened
ppapi::host::ReplyMessageContext reply_context,
const base::FilePath& path,
base::File::Error error_code) {
@@ -11,7 +11,7 @@
// Quarantining a file before its contents are available is only supported on
// Windows and Linux.
if (!FileOpenForWrite(open_flags_) || error_code != base::File::FILE_OK) {
@@ -460,7 +460,7 @@ void PepperFileIOHost::OnLocalFileOpened
@@ -459,7 +459,7 @@ void PepperFileIOHost::OnLocalFileOpened
#endif
}
@@ -88,7 +88,7 @@
-#endif // !WIN && !MAC && !LINUX
--- a/content/browser/BUILD.gn
+++ b/content/browser/BUILD.gn
@@ -46,7 +46,6 @@ jumbo_source_set("browser") {
@@ -47,7 +47,6 @@ jumbo_source_set("browser") {
"//components/discardable_memory/service",
"//components/download/database",
"//components/download/public/common:public",

2
patches/ungoogled-chromium/disable-formatting-in-omnibox.patch
View File

@@ -2,7 +2,7 @@
--- a/components/url_formatter/url_formatter.cc
+++ b/components/url_formatter/url_formatter.cc
@@ -406,14 +406,14 @@ bool IDNToUnicodeOneComponent(const base
@@ -411,14 +411,14 @@ IDNConversionStatus IDNToUnicodeOneCompo
} // namespace

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

@@ -3,7 +3,7 @@
--- a/google_apis/gaia/gaia_auth_fetcher.cc
+++ b/google_apis/gaia/gaia_auth_fetcher.cc
@@ -250,55 +250,6 @@ void GaiaAuthFetcher::CreateAndStartGaia
@@ -261,55 +261,6 @@ void GaiaAuthFetcher::CreateAndStartGaia
int load_flags,
const net::NetworkTrafficAnnotationTag& traffic_annotation) {
DCHECK(!fetch_pending_) << "Tried to fetch two things at once!";
@@ -114,7 +114,7 @@
source->AddLocalizedString(
--- a/chrome/browser/browser_resources.grd
+++ b/chrome/browser/browser_resources.grd
@@ -303,7 +303,6 @@
@@ -312,7 +312,6 @@
<include name="IDR_INLINE_LOGIN_HTML" file="resources\inline_login\inline_login.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" />
<include name="IDR_INLINE_LOGIN_CSS" file="resources\inline_login\inline_login.css" flattenhtml="true" type="BINDATA" />
<include name="IDR_INLINE_LOGIN_JS" file="resources\inline_login\inline_login.js" flattenhtml="true" type="BINDATA" />
@@ -122,7 +122,7 @@
<include name="IDR_INSPECT_CSS" file="resources\inspect\inspect.css" flattenhtml="true" type="BINDATA" />
<include name="IDR_INSPECT_HTML" file="resources\inspect\inspect.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" />
<include name="IDR_INSPECT_JS" file="resources\inspect\inspect.js" flattenhtml="true" type="BINDATA" />
@@ -444,7 +443,6 @@
@@ -453,7 +452,6 @@
<include name="IDR_WEBRTC_LOGS_JS" file="resources\media\webrtc_logs.js" type="BINDATA" />
<include name="IDR_WEBSTORE_MANIFEST" file="resources\webstore_app\manifest.json" type="BINDATA" />
<include name="IDR_CRYPTOTOKEN_MANIFEST" file="resources\cryptotoken\manifest.json" type="BINDATA" />

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

@@ -2,7 +2,7 @@
--- a/components/gcm_driver/gcm_client_impl.cc
+++ b/components/gcm_driver/gcm_client_impl.cc
@@ -491,6 +491,7 @@ void GCMClientImpl::StartGCM() {
@@ -493,6 +493,7 @@ void GCMClientImpl::StartGCM() {
}
void GCMClientImpl::InitializeMCSClient() {
@@ -10,7 +10,7 @@
std::vector<GURL> endpoints;
endpoints.push_back(gservices_settings_.GetMCSMainEndpoint());
GURL fallback_endpoint = gservices_settings_.GetMCSFallbackEndpoint();
@@ -684,6 +685,7 @@ void GCMClientImpl::RemoveHeartbeatInter
@@ -686,6 +687,7 @@ void GCMClientImpl::RemoveHeartbeatInter
}
void GCMClientImpl::StartCheckin() {
@@ -18,7 +18,7 @@
// Make sure no checkin is in progress.
if (checkin_request_)
return;
@@ -759,6 +761,7 @@ void GCMClientImpl::SetGServicesSettings
@@ -761,6 +763,7 @@ void GCMClientImpl::SetGServicesSettings
}
void GCMClientImpl::SchedulePeriodicCheckin() {

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

@@ -33,7 +33,7 @@
--- a/components/variations/net/variations_http_headers.cc
+++ b/components/variations/net/variations_http_headers.cc
@@ -26,27 +26,6 @@ namespace variations {
@@ -26,25 +26,6 @@ namespace variations {
namespace {
@@ -55,13 +55,11 @@
-const char* kHostsToSetHeadersFor[] = {
- "googleweblight.com",
-};
-
-const char kClientData[] = "X-Client-Data";
-
// The result of checking if a URL should have variations headers appended.
// This enum is used to record UMA histogram values, and should not be
// reordered.
@@ -63,28 +42,6 @@ enum URLValidationResult {
@@ -61,28 +42,6 @@ enum URLValidationResult {
// Checks whether headers should be appended to the |url|, based on the domain
// of |url|. |url| is assumed to be valid, and to have an http/https scheme.
bool IsGoogleDomain(const GURL& url) {
@@ -90,16 +88,19 @@
return false;
}
@@ -101,8 +58,6 @@ void LogUrlValidationHistogram(URLValida
@@ -99,37 +58,14 @@ void LogUrlValidationHistogram(URLValida
void RemoveVariationsHeader(const net::RedirectInfo& redirect_info,
const network::ResourceResponseHead& response_head,
std::vector<std::string>* to_be_removed_headers) {
- if (!internal::ShouldAppendVariationHeaders(redirect_info.new_url))
- to_be_removed_headers->push_back(kClientData);
- if (!ShouldAppendVariationHeaders(redirect_info.new_url))
- to_be_removed_headers->push_back(kClientDataHeader);
}
} // namespace
@@ -111,27 +66,6 @@ bool AppendVariationHeaders(const GURL&
-const char kClientDataHeader[] = "X-Client-Data";
-
bool AppendVariationHeaders(const GURL& url,
InIncognito incognito,
SignedIn signed_in,
net::HttpRequestHeaders* headers) {
@@ -111,30 +112,29 @@
- // international TLD domains *.google.<TLD> or *.youtube.<TLD>.
- // 2. Only transmit for non-Incognito profiles.
- // 3. For the X-Client-Data header, only include non-empty variation IDs.
- if ((incognito == InIncognito::kYes) ||
- !internal::ShouldAppendVariationHeaders(url)) {
- if ((incognito == InIncognito::kYes) || !ShouldAppendVariationHeaders(url))
- return false;
- }
-
- const std::string variation_ids_header =
- VariationsHttpHeaderProvider::GetInstance()->GetClientDataHeader(
- signed_in == SignedIn::kYes);
- if (!variation_ids_header.empty()) {
- // Note that prior to M33 this header was named X-Chrome-Variations.
- headers->SetHeaderIfMissing(kClientData, variation_ids_header);
- headers->SetHeaderIfMissing(kClientDataHeader, variation_ids_header);
- return true;
- }
return false;
}
@@ -145,7 +79,6 @@ bool AppendVariationHeadersUnknownSigned
@@ -143,8 +79,6 @@ bool AppendVariationHeadersUnknownSigned
std::set<std::string> GetVariationHeaderNames() {
std::set<std::string> headers;
- headers.insert(kClientData);
return headers;
void StripVariationHeaderIfNeeded(const GURL& new_location,
net::URLRequest* request) {
- if (!ShouldAppendVariationHeaders(new_location))
- request->RemoveRequestHeaderByName(kClientDataHeader);
}
std::unique_ptr<network::SimpleURLLoader>
--- a/chrome/browser/page_load_metrics/page_load_metrics_util.cc
+++ b/chrome/browser/page_load_metrics/page_load_metrics_util.cc
@@ -169,9 +169,7 @@ bool DidObserveLoadingBehaviorInAnyFrame
@@ -150,7 +150,7 @@
bool IsGoogleSearchResultUrl(const GURL& url) {
--- a/components/search_engines/template_url.cc
+++ b/components/search_engines/template_url.cc
@@ -499,11 +499,7 @@ base::string16 TemplateURLRef::SearchTer
@@ -505,11 +505,7 @@ base::string16 TemplateURLRef::SearchTer
bool TemplateURLRef::HasGoogleBaseURLs(
const SearchTermsData& search_terms_data) const {
ParseIfNecessary(search_terms_data);
@@ -163,9 +163,9 @@
}
bool TemplateURLRef::ExtractSearchTermsFromURL(
--- a/components/google/core/browser/google_util.cc
+++ b/components/google/core/browser/google_util.cc
@@ -41,118 +41,16 @@ namespace {
--- a/components/google/core/common/google_util.cc
+++ b/components/google/core/common/google_util.cc
@@ -42,118 +42,16 @@ namespace {
bool gUseMockLinkDoctorBaseURLForTesting = false;
@@ -285,12 +285,12 @@
}
void SetMockLinkDoctorBaseURLForTesting() {
@@ -166,120 +64,50 @@ std::string GetGoogleLocale(const std::s
@@ -167,120 +65,49 @@ std::string GetGoogleLocale(const std::s
GURL AppendGoogleLocaleParam(const GURL& url,
const std::string& application_locale) {
- return net::AppendQueryParameter(
- url, "hl", GetGoogleLocale(application_locale));
- return net::AppendQueryParameter(url, "hl",
- GetGoogleLocale(application_locale));
+ return url;
}
@@ -342,7 +342,6 @@
- if (!base_url.is_valid() || base_url.has_query() || base_url.has_ref())
- base_url = GURL();
- }
+ base_url = GURL();
return base_url;
}
@@ -402,7 +401,7 @@
- // Check for query parameter in URL parameter and hash fragment, depending on
- // the path type.
- return HasGoogleSearchQueryParam(url.ref_piece()) ||
- (!is_home_page_base && HasGoogleSearchQueryParam(url.query_piece()));
- (!is_home_page_base && HasGoogleSearchQueryParam(url.query_piece()));
+ return false;
}
@@ -410,8 +409,8 @@
SubdomainPermission subdomain_permission,
PortPermission port_permission) {
- return IsValidURL(url, port_permission) &&
- IsValidHostName(url.host_piece(), "youtube", subdomain_permission,
- nullptr);
- IsValidHostName(url.host_piece(), "youtube", subdomain_permission,
- nullptr);
+ return false;
}
@@ -458,3 +457,34 @@
}
bool IsGoogleHostname(const GURL& url) {
--- a/chrome/common/google_url_loader_throttle.cc
+++ b/chrome/common/google_url_loader_throttle.cc
@@ -33,8 +33,6 @@ void GoogleURLLoaderThrottle::WillStartR
if (!is_off_the_record_ &&
variations::ShouldAppendVariationHeaders(request->url) &&
!variation_ids_header_.empty()) {
- request->headers.SetHeaderIfMissing(variations::kClientDataHeader,
- variation_ids_header_);
}
if (force_safe_search_) {
@@ -66,8 +64,6 @@ void GoogleURLLoaderThrottle::WillRedire
bool* /* defer */,
std::vector<std::string>* to_be_removed_headers,
net::HttpRequestHeaders* /* modified_headers */) {
- if (!variations::ShouldAppendVariationHeaders(redirect_info.new_url))
- to_be_removed_headers->push_back(variations::kClientDataHeader);
}
#if BUILDFLAG(ENABLE_EXTENSIONS)
--- a/chrome/renderer/chrome_content_renderer_client.cc
+++ b/chrome/renderer/chrome_content_renderer_client.cc
@@ -1628,7 +1628,7 @@ void ChromeContentRendererClient::WillDe
bool ChromeContentRendererClient::IsExcludedHeaderForServiceWorkerFetchEvent(
const std::string& header_name) {
- return header_name == variations::kClientDataHeader;
+ return false;
}
// If we're in an extension, there is no need disabling multiple routes as

2
patches/ungoogled-chromium/disable-intranet-redirect-detector.patch
View File

@@ -3,7 +3,7 @@
--- a/chrome/browser/intranet_redirect_detector.cc
+++ b/chrome/browser/intranet_redirect_detector.cc
@@ -77,9 +77,7 @@ void IntranetRedirectDetector::FinishSle
@@ -76,9 +76,7 @@ void IntranetRedirectDetector::FinishSle
simple_loaders_.clear();
resulting_origins_.clear();

4
patches/ungoogled-chromium/disable-mei-preload.patch
View File

@@ -7,7 +7,7 @@
--- a/chrome/BUILD.gn
+++ b/chrome/BUILD.gn
@@ -322,7 +322,6 @@ if (!is_android && !is_mac) {
@@ -327,7 +327,6 @@ if (!is_android && !is_mac) {
}
data_deps += [
@@ -15,7 +15,7 @@
"//third_party/widevine/cdm",
]
@@ -1264,7 +1263,6 @@ if (is_win) {
@@ -1270,7 +1269,6 @@ if (is_win) {
":swiftshader_library",
":widevine_cdm_library",
"//chrome/app/nibs:chrome_xibs",

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

@@ -2,7 +2,7 @@
--- a/components/signin/core/browser/signin_manager_base.cc
+++ b/components/signin/core/browser/signin_manager_base.cc
@@ -158,7 +158,7 @@ void SigninManagerBase::Initialize(PrefS
@@ -155,7 +155,7 @@ void SigninManagerBase::Initialize(PrefS
bool SigninManagerBase::IsInitialized() const { return initialized_; }
bool SigninManagerBase::IsSigninAllowed() const {
@@ -13,7 +13,7 @@
AccountInfo SigninManagerBase::GetAuthenticatedAccountInfo() const {
--- a/chrome/browser/ui/chrome_pages.cc
+++ b/chrome/browser/ui/chrome_pages.cc
@@ -72,12 +72,6 @@ void OpenBookmarkManagerForNode(Browser*
@@ -71,12 +71,6 @@ void OpenBookmarkManagerForNode(Browser*
ShowSingletonTabOverwritingNTP(browser, std::move(params));
}
@@ -26,7 +26,7 @@
// 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
@@ -384,57 +378,6 @@ void ShowSearchEngineSettings(Browser* b
@@ -383,57 +377,6 @@ void ShowSearchEngineSettings(Browser* b
#if !defined(OS_ANDROID)
void ShowBrowserSignin(Browser* browser,
signin_metrics::AccessPoint access_point) {
@@ -60,7 +60,7 @@
- !signin::DiceMethodGreaterOrEqual(
- AccountConsistencyModeManager::GetMethodForProfile(
- browser->profile()),
- signin::AccountConsistencyMethod::kDicePrepareMigration) &&
- signin::AccountConsistencyMethod::kDiceMigration) &&
- browser->tab_strip_model()->empty();
-#endif // defined(OS_CHROMEOS)
- if (show_full_tab_chrome_signin_page) {

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

@@ -27,7 +27,7 @@
}
--- a/components/translate/core/browser/translate_script.cc
+++ b/components/translate/core/browser/translate_script.cc
@@ -152,9 +152,8 @@ void TranslateScript::OnScriptFetchCompl
@@ -154,9 +154,8 @@ void TranslateScript::OnScriptFetchCompl
base::StringAppendF(&data_, "var serverParams = '%s';\n",
server_params.c_str());
@@ -36,5 +36,5 @@
- &data_, "var securityOrigin = '%s';", security_origin.spec().c_str());
+ &data_, "var securityOrigin = '';");
// Append embedded translate.js and a remote element library.
// Load embedded translate.js.
base::StringPiece str =

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

@@ -82,7 +82,7 @@
--- a/rlz/lib/financial_ping.cc
+++ b/rlz/lib/financial_ping.cc
@@ -350,7 +350,7 @@ FinancialPing::PingResponse FinancialPin
@@ -339,7 +339,7 @@ FinancialPing::PingResponse FinancialPin
// Open network connection.
InternetHandle connection_handle = InternetConnectA(inet_handle,
@@ -91,7 +91,7 @@
INTERNET_FLAG_NO_CACHE_WRITE, 0);
if (!connection_handle)
return PING_FAILURE;
@@ -394,7 +394,7 @@ FinancialPing::PingResponse FinancialPin
@@ -383,7 +383,7 @@ FinancialPing::PingResponse FinancialPin
return PING_SUCCESSFUL;
#else
std::string url =

2
patches/ungoogled-chromium/disable-webgl-renderer-info.patch
View File

@@ -3,7 +3,7 @@
--- a/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc
+++ b/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc
@@ -3247,16 +3247,14 @@ ScriptValue WebGLRenderingContextBase::g
@@ -3276,16 +3276,14 @@ ScriptValue WebGLRenderingContextBase::g
return ScriptValue::CreateNull(script_state);
case WebGLDebugRendererInfo::kUnmaskedRendererWebgl:
if (ExtensionEnabled(kWebGLDebugRendererInfoName))

12
patches/ungoogled-chromium/disable-webrtc-log-uploader.patch
View File

@@ -2,7 +2,7 @@
--- a/chrome/browser/media/webrtc/webrtc_log_uploader.cc
+++ b/chrome/browser/media/webrtc/webrtc_log_uploader.cc
@@ -117,30 +117,10 @@ void WebRtcLogUploader::LoggingStoppedDo
@@ -117,30 +117,11 @@ void WebRtcLogUploader::LoggingStoppedDo
DCHECK(meta_data.get());
DCHECK(!upload_done_data.log_path.empty());
@@ -21,11 +21,11 @@
- WriteCompressedLogToFile(compressed_log, log_file_path);
-
- base::FilePath log_list_path =
- webrtc_logging::LogList::GetWebRtcLogListFileForDirectory(
- webrtc_logging::TextLogList::GetWebRtcLogListFileForDirectory(
- upload_done_data.log_path);
- AddLocallyStoredLogInfoToUploadListFile(log_list_path, local_log_id);
}
-
- WebRtcLogUploadDoneData upload_done_data_with_log_id = upload_done_data;
- upload_done_data_with_log_id.local_log_id = local_log_id;
- PrepareMultipartPostData(compressed_log, std::move(meta_data),
@@ -34,7 +34,7 @@
}
void WebRtcLogUploader::PrepareMultipartPostData(
@@ -151,27 +131,7 @@ void WebRtcLogUploader::PrepareMultipart
@@ -151,27 +132,7 @@ void WebRtcLogUploader::PrepareMultipart
DCHECK(!compressed_log.empty());
DCHECK(meta_data.get());
@@ -63,12 +63,12 @@
}
void WebRtcLogUploader::UploadStoredLog(
@@ -237,48 +197,6 @@ void WebRtcLogUploader::LoggingStoppedDo
@@ -237,48 +198,6 @@ void WebRtcLogUploader::LoggingStoppedDo
webrtc_logging::DeleteOldWebRtcLogFiles(log_paths.log_path);
- base::FilePath log_list_path =
- webrtc_logging::LogList::GetWebRtcLogListFileForDirectory(
- webrtc_logging::TextLogList::GetWebRtcLogListFileForDirectory(
- log_paths.log_path);
-
- // Store the native log with a ".gz" extension.

14
patches/ungoogled-chromium/disable-webstore-urls.patch
View File

@@ -30,7 +30,7 @@
--- a/extensions/browser/updater/extension_downloader.cc
+++ b/extensions/browser/updater/extension_downloader.cc
@@ -90,27 +90,18 @@ const char kDefaultInstallSource[] = "";
@@ -92,27 +92,18 @@ const char kDefaultInstallSource[] = "";
const char kDefaultInstallLocation[] = "";
const char kReinstallInstallSource[] = "reinstall";
@@ -58,9 +58,9 @@
- }
+ kMaxRetries + 1);
bool ShouldRetryRequest(const net::URLRequestStatus& status,
int response_code) {
@@ -298,18 +289,6 @@ void ExtensionDownloader::StartBlacklist
bool ShouldRetryRequest(network::SimpleURLLoader* loader) {
DCHECK(loader);
@@ -308,18 +299,6 @@ void ExtensionDownloader::StartBlacklist
const std::string& version,
const ManifestFetchData::PingData& ping_data,
int request_id) {
@@ -79,7 +79,7 @@
}
void ExtensionDownloader::SetWebstoreAuthenticationCapabilities(
@@ -342,23 +321,16 @@ bool ExtensionDownloader::AddExtensionDa
@@ -352,23 +331,16 @@ bool ExtensionDownloader::AddExtensionDa
return false;
}
@@ -105,7 +105,7 @@
} else {
url_stats_.other_url_count++;
}
@@ -675,20 +647,6 @@ void ExtensionDownloader::HandleManifest
@@ -692,20 +664,6 @@ void ExtensionDownloader::HandleManifest
fetch_data->request_ids()));
}
@@ -126,7 +126,7 @@
NotifyExtensionsDownloadFailed(
no_updates, fetch_data->request_ids(),
ExtensionDownloaderDelegate::NO_UPDATE_AVAILABLE);
@@ -1081,11 +1039,7 @@ bool ExtensionDownloader::IterateFetchCr
@@ -1113,11 +1071,7 @@ bool ExtensionDownloader::IterateFetchCr
// fetch.
switch (fetch->credentials) {
case ExtensionFetch::CREDENTIALS_NONE:

6
patches/ungoogled-chromium/enable-page-saving-on-more-pages.patch
View File

@@ -2,7 +2,7 @@
--- a/content/public/common/url_utils.cc
+++ b/content/public/common/url_utils.cc
@@ -20,11 +20,7 @@ bool HasWebUIScheme(const GURL& url) {
@@ -24,11 +24,7 @@ bool HasWebUIScheme(const GURL& url) {
}
bool IsSavableURL(const GURL& url) {
@@ -17,7 +17,7 @@
// PlzNavigate
--- a/chrome/browser/ui/browser_commands.cc
+++ b/chrome/browser/ui/browser_commands.cc
@@ -346,12 +346,6 @@ int GetContentRestrictions(const Browser
@@ -367,12 +367,6 @@ int GetContentRestrictions(const Browser
CoreTabHelper* core_tab_helper =
CoreTabHelper::FromWebContents(current_tab);
content_restrictions = core_tab_helper->content_restrictions();
@@ -30,7 +30,7 @@
if (current_tab->ShowingInterstitialPage())
content_restrictions |= CONTENT_RESTRICTION_PRINT;
}
@@ -900,8 +894,7 @@ bool CanSavePage(const Browser* browser)
@@ -921,8 +915,7 @@ bool CanSavePage(const Browser* browser)
prefs::kAllowFileSelectionDialogs)) {
return false;
}

21
patches/ungoogled-chromium/fix-building-without-mdns-and-service-discovery.patch
View File

@@ -2,23 +2,14 @@
--- a/chrome/browser/media/router/discovery/mdns/dns_sd_device_lister.cc
+++ b/chrome/browser/media/router/discovery/mdns/dns_sd_device_lister.cc
@@ -31,52 +31,25 @@ DnsSdDeviceLister::DnsSdDeviceLister(
DnsSdDelegate* delegate,
const std::string& service_type)
: delegate_(delegate),
- device_lister_(local_discovery::ServiceDiscoveryDeviceLister::Create(
- this,
- service_discovery_client,
- service_type)),
+ device_lister_(),
started_(false) {}
@@ -37,48 +37,22 @@ DnsSdDeviceLister::DnsSdDeviceLister(
DnsSdDeviceLister::~DnsSdDeviceLister() {}
void DnsSdDeviceLister::Discover() {
- if (!started_) {
- if (!device_lister_) {
- device_lister_ = local_discovery::ServiceDiscoveryDeviceLister::Create(
- this, service_discovery_client_, service_type_);
- device_lister_->Start();
- started_ = true;
- VLOG(1) << "Started device lister for service type "
- << device_lister_->service_type();
- }
@@ -27,6 +18,10 @@
- << device_lister_->service_type();
}
void DnsSdDeviceLister::Reset() {
- device_lister_.reset();
}
void DnsSdDeviceLister::OnDeviceChanged(
const std::string& service_type,
bool added,

16
patches/ungoogled-chromium/fix-building-without-one-click-signin.patch
View File

@@ -2,7 +2,7 @@
--- a/chrome/browser/ui/sync/one_click_signin_sync_starter.cc
+++ b/chrome/browser/ui/sync/one_click_signin_sync_starter.cc
@@ -399,6 +399,7 @@ void OneClickSigninSyncStarter::CancelSi
@@ -397,6 +397,7 @@ void OneClickSigninSyncStarter::CancelSi
}
void OneClickSigninSyncStarter::ConfirmAndSignin() {
@@ -10,7 +10,7 @@
SigninManager* signin = SigninManagerFactory::GetForProfile(profile_);
if (confirmation_required_ == CONFIRM_UNTRUSTED_SIGNIN) {
browser_ = EnsureBrowser(browser_, profile_);
@@ -413,6 +414,7 @@ void OneClickSigninSyncStarter::ConfirmA
@@ -411,6 +412,7 @@ void OneClickSigninSyncStarter::ConfirmA
// No confirmation required - just sign in the user.
signin->CompletePendingSignin();
}
@@ -36,7 +36,7 @@
}
--- a/chrome/browser/ui/BUILD.gn
+++ b/chrome/browser/ui/BUILD.gn
@@ -420,10 +420,6 @@ split_static_library("ui") {
@@ -369,10 +369,6 @@ jumbo_split_static_library("ui") {
"cocoa/omnibox/omnibox_view_mac.mm",
"cocoa/omnibox_decoration_bubble_controller.h",
"cocoa/omnibox_decoration_bubble_controller.mm",
@@ -44,15 +44,15 @@
- "cocoa/one_click_signin_dialog_controller.mm",
- "cocoa/one_click_signin_view_controller.h",
- "cocoa/one_click_signin_view_controller.mm",
"cocoa/page_info/page_info_bubble_controller.h",
"cocoa/page_info/page_info_bubble_controller.mm",
"cocoa/page_info/page_info_utils_cocoa.h",
@@ -3418,8 +3414,6 @@ split_static_library("ui") {
"cocoa/permission_bubble/chooser_bubble_ui_cocoa.h",
"cocoa/permission_bubble/chooser_bubble_ui_cocoa.mm",
"cocoa/permission_bubble/chooser_bubble_ui_views_mac.mm",
@@ -3362,8 +3358,6 @@ jumbo_split_static_library("ui") {
"views/policy/enterprise_startup_dialog_view.h",
"views/profiles/forced_reauthentication_dialog_view.cc",
"views/profiles/forced_reauthentication_dialog_view.h",
- "views/sync/one_click_signin_dialog_view.cc",
- "views/sync/one_click_signin_dialog_view.h",
"views/tabs/window_finder.cc",
]
}

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

@@ -2,7 +2,7 @@
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -4667,18 +4667,5 @@ safe_browsing::UrlCheckerDelegate*
@@ -4789,18 +4789,5 @@ safe_browsing::UrlCheckerDelegate*
ChromeContentBrowserClient::GetSafeBrowsingUrlCheckerDelegate(
content::ResourceContext* resource_context) {
DCHECK_CURRENTLY_ON(BrowserThread::IO);
@@ -122,7 +122,7 @@
bool DownloadItemModel::ShouldRemoveFromShelfWhenComplete() const {
--- a/chrome/browser/ui/views/safe_browsing/password_reuse_modal_warning_dialog.cc
+++ b/chrome/browser/ui/views/safe_browsing/password_reuse_modal_warning_dialog.cc
@@ -60,9 +60,7 @@ PasswordReuseModalWarningDialog::Passwor
@@ -57,9 +57,7 @@ PasswordReuseModalWarningDialog::Passwor
SetLayoutManager(std::make_unique<views::FillLayout>());
views::Label* message_body_label = new views::Label(

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

@@ -2,7 +2,7 @@
--- a/content/renderer/render_view_impl.cc
+++ b/content/renderer/render_view_impl.cc
@@ -300,7 +300,7 @@ WindowOpenDisposition RenderViewImpl::Na
@@ -299,7 +299,7 @@ WindowOpenDisposition RenderViewImpl::Na
case blink::kWebNavigationPolicyNewWindow:
return WindowOpenDisposition::NEW_WINDOW;
case blink::kWebNavigationPolicyNewPopup:

10
patches/ungoogled-chromium/use-local-devtools-files.patch
View File

@@ -5,7 +5,7 @@
--- a/third_party/blink/renderer/devtools/BUILD.gn
+++ b/third_party/blink/renderer/devtools/BUILD.gn
@@ -1147,10 +1147,8 @@ action("generate_devtools_grd") {
@@ -1150,10 +1150,8 @@ action("generate_devtools_grd") {
devtools_embedder_scripts +
[ "$resources_out_dir/devtools_extension_api.js" ]
@@ -30,16 +30,16 @@
}
--- a/third_party/blink/renderer/devtools/front_end/devtools_app.json
+++ b/third_party/blink/renderer/devtools/front_end/devtools_app.json
@@ -5,7 +5,7 @@
@@ -4,7 +4,7 @@
{ "name": "inspector_main", "type": "autostart" },
{ "name": "mobile_throttling", "type": "autostart" },
{ "name": "browser_components", "type": "autostart" },
- { "name": "accessibility", "type": "remote" },
+ { "name": "accessibility" },
{ "name": "animation" },
{ "name": "audits2" },
{ "name": "browser_console" },
@@ -13,14 +13,14 @@
@@ -12,14 +12,14 @@
{ "name": "cookie_table" },
{ "name": "devices" },
{ "name": "elements" },
@@ -78,7 +78,7 @@
{ "name": "protocol_monitor"}
--- a/third_party/blink/renderer/devtools/front_end/worker_app.json
+++ b/third_party/blink/renderer/devtools/front_end/worker_app.json
@@ -12,7 +12,7 @@
@@ -11,7 +11,7 @@
{ "name": "help" },
{ "name": "layer_viewer" },
{ "name": "network" },