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

Update patches, cleaning list and domain substitution list for 64.0.3282.119

Browse Source
This commit is contained in:
Timothy Vaccarelli
2018-01-25 12:46:11 -05:00
parent 4ba52f9510
commit 41ac048892
68 changed files with 1860 additions and 1231 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
resources/configs/archlinux/patch_order
View File

@@ -1 +0,0 @@
inox-patchset/chromium-libva-r2.patch

1057
resources/configs/common/cleaning_list
View File

File diff suppressed because it is too large Load Diff

511
resources/configs/common/domain_substitution_list
View File

File diff suppressed because it is too large Load Diff

1
resources/configs/common/gn_flags
View File

@@ -1,6 +1,5 @@
enable_google_now=false
enable_hangout_services_extension=false
enable_hotwording=false
enable_iterator_debugging=false
enable_mdns=false
enable_nacl=false

8
resources/configs/common/patch_order
View File

@@ -1,6 +1,8 @@
inox-patchset/chromium-clang-r1.patch
inox-patchset/chromium-angle-r0.patch
inox-patchset/chromium-clang-r2.patch
inox-patchset/chromium-cups-r0.patch
inox-patchset/chromium-memcpy-r0.patch
inox-patchset/chromium-exclude_unwind_tables.patch
inox-patchset/chromium-disable-SharedArrayBuffer-by-default.patch
inox-patchset/chromium-omnibox-unescape-fragment.patch
inox-patchset/chromium-skia-harmony.patch
inox-patchset/0001-fix-building-without-safebrowsing.patch
@@ -23,7 +25,6 @@ inox-patchset/0019-disable-battery-status-service.patch
inox-patchset/0021-disable-rlz.patch
inox-patchset/9000-disable-metrics.patch
debian/disable/promo.patch
debian/disable/fuzzers.patch
debian/disable/google-api-warning.patch
debian/disable/device-notifications.patch
@@ -50,7 +51,6 @@ iridium-browser/safe_browsing-disable-reporting-of-safebrowsing-over.patch
iridium-browser/safe_browsing-support-trk-prefix.patch
iridium-browser/all-add-trk-prefixes-to-possibly-evil-connections.patch
iridium-browser/promo-disable-Google-promotion-fetching.patch
iridium-browser/hotword-disable-at-build-time-by-default.patch
iridium-browser/browser-disable-profile-auto-import-on-first-run.patch
ungoogled-chromium/clear-http-auth-cache-menu-item.patch

2
resources/configs/linux_portable/patch_order
View File

@@ -1,4 +1,2 @@
inox-patchset/chromium-webrtc-r0.patch
ubuntu/no-new-ninja-flag.patch
ubuntu/relax-ninja-version-requirement.patch

4
resources/configs/linux_rooted/patch_order
View File

@@ -1,6 +1,4 @@
inox-patchset/chromium-webrtc-r0.patch
inox-patchset/chromium-vaapi-r15.patch
inox-patchset/chromium-vaapi-r16.patch
debian/manpage.patch

2
resources/configs/opensuse/patch_order
View File

@@ -1,3 +1,5 @@
inox-patchset/chromium-vaapi-r16.patch
opensuse/fix-network-api-crash.patch
opensuse/gcc60-fixes.patch
opensuse/master-preferences.patch

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

@@ -3,7 +3,7 @@ author: Michael Gilbert <mgilbert@debian.org>
--- a/chrome/browser/ui/startup/startup_browser_creator_impl.cc
+++ b/chrome/browser/ui/startup/startup_browser_creator_impl.cc
@@ -778,8 +778,6 @@ void StartupBrowserCreatorImpl::AddInfoB
@@ -791,8 +791,6 @@ void StartupBrowserCreatorImpl::AddInfoB
!command_line_.HasSwitch(switches::kTestType) &&
!command_line_.HasSwitch(switches::kEnableAutomation)) {
chrome::ShowBadFlagsPrompt(browser);

15
resources/patches/debian/disable/promo.patch
View File

@@ -1,15 +0,0 @@
description: disable the ad promo system by default
author: Michael Gilbert <mgilbert@debian.org>
bug-debian: http://bugs.debian.org/634101
--- a/chrome/browser/ui/app_list/app_list_service.cc
+++ b/chrome/browser/ui/app_list/app_list_service.cc
@@ -145,7 +145,7 @@ void AppListService::RegisterPrefs(PrefR
// Identifies whether we should show the app launcher promo or not. This
// becomes false when the user dismisses the promo.
- registry->RegisterBooleanPref(prefs::kShowAppLauncherPromo, true);
+ registry->RegisterBooleanPref(prefs::kShowAppLauncherPromo, false);
}
// static

4
resources/patches/debian/fixes/mojo.patch
View File

@@ -3,7 +3,7 @@ author: Michael Gilbert <mgilbert@debian.org>
--- a/content/shell/BUILD.gn
+++ b/content/shell/BUILD.gn
@@ -92,8 +92,6 @@ static_library("content_shell_lib") {
@@ -93,8 +93,6 @@ static_library("content_shell_lib") {
"browser/layout_test/layout_test_resource_dispatcher_host_delegate.h",
"browser/layout_test/layout_test_url_request_context_getter.cc",
"browser/layout_test/layout_test_url_request_context_getter.h",
@@ -12,7 +12,7 @@ author: Michael Gilbert <mgilbert@debian.org>
"browser/layout_test/secondary_test_window_observer.cc",
"browser/layout_test/secondary_test_window_observer.h",
"browser/layout_test/test_info_extractor.cc",
@@ -237,9 +235,7 @@ static_library("content_shell_lib") {
@@ -244,9 +242,7 @@ static_library("content_shell_lib") {
"//content/public/common",
"//content/public/common:service_names",
"//content/shell/test_runner:test_runner",

2
resources/patches/debian/fixes/optimize.patch
View File

@@ -3,7 +3,7 @@ author: Michael Gilbert <mgilbert@debian.org>
--- a/build/config/compiler/BUILD.gn
+++ b/build/config/compiler/BUILD.gn
@@ -70,6 +70,8 @@ declare_args() {
@@ -71,6 +71,8 @@ declare_args() {
msvs_xtree_patched = false
}

2
resources/patches/debian/gn/narrowing.patch
View File

@@ -3,7 +3,7 @@ author: Michael Gilbert <mgilbert@debian.org>
--- a/tools/gn/bootstrap/bootstrap.py
+++ b/tools/gn/bootstrap/bootstrap.py
@@ -352,7 +352,7 @@ def write_gn_ninja(path, root_gen_dir, o
@@ -365,7 +365,7 @@ def write_gn_ninja(path, root_gen_dir, o
'-pipe',
'-fno-exceptions'
])

6
resources/patches/debian/gn/parallel.patch
View File

@@ -3,15 +3,15 @@ author: Michael Gilbert <mgilbert@debian.org>
--- a/tools/gn/bootstrap/bootstrap.py
+++ b/tools/gn/bootstrap/bootstrap.py
@@ -111,6 +111,7 @@ def main(argv):
parser.add_option('--gn-gen-args', help='Args to pass to gn gen --args')
@@ -115,6 +115,7 @@ def main(argv):
'relative to the src directory. (eg. out/Release)')
parser.add_option('-v', '--verbose', action='store_true',
help='Log more details')
+ parser.add_option('-j', '--jobs', help='Number of jobs')
options, args = parser.parse_args(argv)
if args:
@@ -208,6 +209,8 @@ def build_gn_with_ninja_manually(tempdir
@@ -221,6 +222,8 @@ def build_gn_with_ninja_manually(tempdir
cmd = ['ninja', '-C', tempdir, '-w', 'dupbuild=err']
if options.verbose:
cmd.append('-v')

246
resources/patches/inox-patchset/0001-fix-building-without-safebrowsing.patch
View File

@@ -1,6 +1,14 @@
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -643,7 +643,6 @@ class CertificateReportingServiceCertRep
@@ -639,6 +639,7 @@ void SetApplicationLocaleOnIOThread(cons
g_io_thread_application_locale.Get() = locale;
}
+#if 0
// An implementation of the SSLCertReporter interface used by
// SSLErrorHandler. Uses CertificateReportingService to send reports. The
// service handles queueing and re-sending of failed reports. Each certificate
@@ -654,7 +655,6 @@ class CertificateReportingServiceCertRep
// SSLCertReporter implementation
void ReportInvalidCertificateChain(
const std::string& serialized_report) override {
@@ -8,7 +16,15 @@
}
private:
@@ -1704,7 +1703,7 @@ void ChromeContentBrowserClient::AppendE
@@ -662,6 +662,7 @@ class CertificateReportingServiceCertRep
DISALLOW_COPY_AND_ASSIGN(CertificateReportingServiceCertReporter);
};
+#endif
#if defined(OS_ANDROID)
float GetDeviceScaleAdjustment() {
@@ -1752,7 +1753,7 @@ void ChromeContentBrowserClient::AppendE
// Disable client-side phishing detection in the renderer if it is
// disabled in the Profile preferences or the browser process.
if (!prefs->GetBoolean(prefs::kSafeBrowsingEnabled) ||
@@ -17,24 +33,16 @@
command_line->AppendSwitch(
switches::kDisableClientSidePhishingDetection);
}
@@ -2281,15 +2280,9 @@ void ChromeContentBrowserClient::AllowCe
// Otherwise, display an SSL blocking page. The interstitial page takes
// ownership of ssl_blocking_page.
- CertificateReportingService* cert_reporting_service =
- CertificateReportingServiceFactory::GetForBrowserContext(
- web_contents->GetBrowserContext());
- std::unique_ptr<CertificateReportingServiceCertReporter> cert_reporter(
- new CertificateReportingServiceCertReporter(cert_reporting_service));
-
@@ -2361,7 +2362,7 @@ void ChromeContentBrowserClient::AllowCe
SSLErrorHandler::HandleSSLError(
web_contents, cert_error, ssl_info, request_url, strict_enforcement,
- expired_previous_decision, std::move(cert_reporter), callback);
+ expired_previous_decision, nullptr, callback);
expired_previous_decision,
- std::make_unique<CertificateReportingServiceCertReporter>(web_contents),
+ nullptr,
callback, SSLErrorHandler::BlockingPageReadyCallback());
}
void ChromeContentBrowserClient::SelectClientCertificate(
@@ -2478,8 +2471,6 @@ bool ChromeContentBrowserClient::CanCrea
@@ -2551,8 +2552,6 @@ bool ChromeContentBrowserClient::CanCrea
void ChromeContentBrowserClient::ResourceDispatcherHostCreated() {
DCHECK_CURRENTLY_ON(BrowserThread::UI);
@@ -43,7 +51,7 @@
for (size_t i = 0; i < extra_parts_.size(); ++i)
extra_parts_[i]->ResourceDispatcherHostCreated();
@@ -2996,17 +2987,6 @@ void ChromeContentBrowserClient::ExposeI
@@ -3043,17 +3042,6 @@ void ChromeContentBrowserClient::ExposeI
base::RetainedRef(context)));
}
@@ -61,7 +69,16 @@
#if defined(OS_WIN)
if (base::FeatureList::IsEnabled(features::kModuleDatabase)) {
// Add the ModuleEventSink interface. This is the interface used by renderer
@@ -3585,12 +3565,6 @@ ChromeContentBrowserClient::CreateURLLoa
@@ -3508,7 +3496,7 @@ ChromeContentBrowserClient::CreateThrott
switches::kCommittedInterstitials)) {
throttles.push_back(std::make_unique<SSLErrorNavigationThrottle>(
handle,
- std::make_unique<CertificateReportingServiceCertReporter>(web_contents),
+ nullptr,
base::Bind(&SSLErrorHandler::HandleSSLError)));
}
@@ -3697,12 +3685,6 @@ ChromeContentBrowserClient::CreateURLLoa
std::vector<std::unique_ptr<content::URLLoaderThrottle>> result;
@@ -74,7 +91,7 @@
return result;
}
@@ -3646,18 +3620,3 @@ void ChromeContentBrowserClient::SetDefa
@@ -3781,18 +3763,3 @@ void ChromeContentBrowserClient::SetDefa
const storage::QuotaSettings* settings) {
g_default_quota_settings = settings;
}
@@ -125,7 +142,7 @@
GetIOTaskRunner(), std::move(delegate));
--- a/chrome/browser/loader/chrome_resource_dispatcher_host_delegate.cc
+++ b/chrome/browser/loader/chrome_resource_dispatcher_host_delegate.cc
@@ -399,8 +399,7 @@ void NotifyUIThreadOfRequestComplete(
@@ -406,8 +406,7 @@ void NotifyUIThreadOfRequestComplete(
} // namespace
ChromeResourceDispatcherHostDelegate::ChromeResourceDispatcherHostDelegate()
@@ -135,17 +152,16 @@
#if BUILDFLAG(ENABLE_EXTENSIONS)
, user_script_listener_(new extensions::UserScriptListener())
#endif
@@ -450,9 +449,6 @@ void ChromeResourceDispatcherHostDelegat
@@ -457,8 +456,6 @@ void ChromeResourceDispatcherHostDelegat
content::AppCacheService* appcache_service,
ResourceType resource_type,
std::vector<std::unique_ptr<content::ResourceThrottle>>* throttles) {
- if (safe_browsing_.get())
- safe_browsing_->OnResourceRequest(request);
-
const ResourceRequestInfo* info = ResourceRequestInfo::ForRequest(request);
ProfileIOData* io_data = ProfileIOData::FromResourceContext(resource_context);
client_hints::RequestBeginning(request, io_data->GetCookieSettings());
#if BUILDFLAG(ENABLE_OFFLINE_PAGES)
@@ -638,13 +634,13 @@ void ChromeResourceDispatcherHostDelegat
@@ -644,13 +641,13 @@ void ChromeResourceDispatcherHostDelegat
content::ResourceThrottle* first_throttle = NULL;
#if defined(OS_ANDROID)
first_throttle = DataReductionProxyResourceThrottle::MaybeCreate(
@@ -304,7 +320,7 @@
--- a/chrome/browser/download/chrome_download_manager_delegate.cc
+++ b/chrome/browser/download/chrome_download_manager_delegate.cc
@@ -228,13 +228,6 @@ ChromeDownloadManagerDelegate::~ChromeDo
@@ -280,13 +280,6 @@ ChromeDownloadManagerDelegate::~ChromeDo
void ChromeDownloadManagerDelegate::SetDownloadManager(DownloadManager* dm) {
download_manager_ = dm;
@@ -318,7 +334,7 @@
}
void ChromeDownloadManagerDelegate::Shutdown() {
@@ -498,16 +491,6 @@ void ChromeDownloadManagerDelegate::Choo
@@ -556,16 +549,6 @@ download::InProgressCache* ChromeDownloa
void ChromeDownloadManagerDelegate::SanitizeSavePackageResourceName(
base::FilePath* filename) {
@@ -337,7 +353,7 @@
void ChromeDownloadManagerDelegate::OpenDownloadUsingPlatformHandler(
--- a/chrome/browser/browser_process_impl.cc
+++ b/chrome/browser/browser_process_impl.cc
@@ -70,7 +70,6 @@
@@ -71,7 +71,6 @@
#include "chrome/browser/printing/print_job_manager.h"
#include "chrome/browser/printing/print_preview_dialog_controller.h"
#include "chrome/browser/profiles/profile_manager.h"
@@ -345,15 +361,15 @@
#include "chrome/browser/shell_integration.h"
#include "chrome/browser/status_icons/status_tray.h"
#include "chrome/browser/ui/browser_dialogs.h"
@@ -217,7 +216,6 @@ BrowserProcessImpl::BrowserProcessImpl(
@@ -220,7 +219,6 @@ BrowserProcessImpl::BrowserProcessImpl(
created_icon_manager_(false),
created_notification_ui_manager_(false),
created_notification_bridge_(false),
- created_safe_browsing_service_(false),
created_subresource_filter_ruleset_service_(false),
created_optimization_guide_service_(false),
shutting_down_(false),
tearing_down_(false),
@@ -312,8 +310,6 @@ void BrowserProcessImpl::StartTearDown()
@@ -309,8 +307,6 @@ void BrowserProcessImpl::StartTearDown()
// that URLFetcher operation before going away.)
metrics_services_manager_.reset();
intranet_redirect_detector_.reset();
@@ -362,7 +378,7 @@
network_time_tracker_.reset();
#if BUILDFLAG(ENABLE_PLUGINS)
plugins_resource_service_.reset();
@@ -917,22 +913,6 @@ StatusTray* BrowserProcessImpl::status_t
@@ -922,22 +918,6 @@ StatusTray* BrowserProcessImpl::status_t
return status_tray_.get();
}
@@ -385,7 +401,7 @@
subresource_filter::ContentRulesetService*
BrowserProcessImpl::subresource_filter_ruleset_service() {
DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
@@ -1207,16 +1187,6 @@ void BrowserProcessImpl::CreateBackgroun
@@ -1230,16 +1210,6 @@ void BrowserProcessImpl::CreateBackgroun
#endif
}
@@ -404,7 +420,7 @@
created_subresource_filter_ruleset_service_ = true;
--- a/chrome/browser/browser_process_impl.h
+++ b/chrome/browser/browser_process_impl.h
@@ -133,9 +133,6 @@ class BrowserProcessImpl : public Browse
@@ -134,9 +134,6 @@ class BrowserProcessImpl : public Browse
void set_background_mode_manager_for_test(
std::unique_ptr<BackgroundModeManager> manager) override;
StatusTray* status_tray() override;
@@ -413,8 +429,8 @@
- override;
subresource_filter::ContentRulesetService*
subresource_filter_ruleset_service() override;
@@ -263,9 +260,6 @@ class BrowserProcessImpl : public Browse
optimization_guide::OptimizationGuideService* optimization_guide_service()
@@ -269,9 +266,6 @@ class BrowserProcessImpl : public Browse
std::unique_ptr<BackgroundModeManager> background_mode_manager_;
#endif
@@ -426,9 +442,9 @@
subresource_filter_ruleset_service_;
--- a/chrome/browser/browser_process.h
+++ b/chrome/browser/browser_process.h
@@ -43,10 +43,6 @@ class WatchDogThread;
class WebRtcLogUploader;
#endif
@@ -46,10 +46,6 @@ namespace content {
class NetworkConnectionTracker;
}
-namespace safe_browsing {
-class SafeBrowsingService;
@@ -437,7 +453,7 @@
namespace subresource_filter {
class ContentRulesetService;
}
@@ -119,10 +115,6 @@ namespace resource_coordinator {
@@ -126,10 +122,6 @@ namespace resource_coordinator {
class TabManager;
}
@@ -445,10 +461,10 @@
-class ClientSideDetectionService;
-}
-
namespace ukm {
class UkmRecorder;
}
@@ -244,14 +236,6 @@ class BrowserProcess {
// NOT THREAD SAFE, call only from the main thread.
// These functions shouldn't return NULL unless otherwise noted.
class BrowserProcess {
@@ -250,14 +242,6 @@ class BrowserProcess {
// on this platform (or this is a unit test).
virtual StatusTray* status_tray() = 0;
@@ -724,7 +740,7 @@
extension.erase(0, 1);
--- a/chrome/browser/component_updater/file_type_policies_component_installer.cc
+++ b/chrome/browser/component_updater/file_type_policies_component_installer.cc
@@ -36,20 +36,6 @@ const uint8_t kPublicKeySHA256[32] = {
@@ -38,20 +38,6 @@ const uint8_t kPublicKeySHA256[32] = {
const char kFileTypePoliciesManifestName[] = "File Type Policies";
void LoadFileTypesFromDisk(const base::FilePath& pb_path) {
@@ -780,8 +796,8 @@
void DownloadTargetDeterminer::OnDownloadDestroyed(
--- a/chrome/browser/permissions/permission_uma_util.cc
+++ b/chrome/browser/permissions/permission_uma_util.cc
@@ -696,8 +696,6 @@ void PermissionUmaUtil::RecordPermission
PermissionPersistDecision::UNSPECIFIED,
@@ -498,8 +498,6 @@ void PermissionUmaUtil::RecordPermission
requesting_origin, permission, action, source_ui, gesture_type,
autoblocker->GetDismissCount(requesting_origin, permission),
autoblocker->GetIgnoreCount(requesting_origin, permission));
- g_browser_process->safe_browsing_service()
@@ -803,7 +819,7 @@
return !download_item_->IsDone();
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -2307,8 +2307,6 @@ split_static_library("browser") {
@@ -2349,8 +2349,6 @@ split_static_library("browser") {
"download/download_commands.h",
"download/download_crx_util.cc",
"download/download_crx_util.h",
@@ -811,10 +827,10 @@
- "download/download_danger_prompt.h",
"download/download_dir_policy_handler.cc",
"download/download_dir_policy_handler.h",
"download/download_shelf.cc",
"download/download_dir_util.cc",
--- a/chrome/browser/ui/BUILD.gn
+++ b/chrome/browser/ui/BUILD.gn
@@ -1993,7 +1993,6 @@ split_static_library("ui") {
@@ -2047,7 +2047,6 @@ split_static_library("ui") {
"cocoa/dialog_text_field_editor.mm",
"cocoa/download/background_theme.h",
"cocoa/download/background_theme.mm",
@@ -822,7 +838,7 @@
"cocoa/download/download_item_button.h",
"cocoa/download/download_item_button.mm",
"cocoa/download/download_item_cell.h",
@@ -2650,7 +2649,6 @@ split_static_library("ui") {
@@ -2707,7 +2706,6 @@ split_static_library("ui") {
"views/cookie_info_view.h",
"views/device_chooser_content_view.cc",
"views/device_chooser_content_view.h",
@@ -832,7 +848,7 @@
"views/exclusive_access_bubble_views.cc",
--- a/chrome/browser/ssl/security_state_tab_helper.cc
+++ b/chrome/browser/ssl/security_state_tab_helper.cc
@@ -181,6 +181,7 @@ bool SecurityStateTabHelper::UsedPolicyI
@@ -180,6 +180,7 @@ bool SecurityStateTabHelper::UsedPolicyI
security_state::MaliciousContentStatus
SecurityStateTabHelper::GetMaliciousContentStatus() const {
@@ -840,7 +856,7 @@
content::NavigationEntry* entry =
web_contents()->GetController().GetVisibleEntry();
if (!entry)
@@ -236,6 +237,7 @@ SecurityStateTabHelper::GetMaliciousCont
@@ -235,6 +236,7 @@ SecurityStateTabHelper::GetMaliciousCont
break;
}
}
@@ -850,9 +866,9 @@
--- a/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc
+++ b/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc
@@ -703,40 +703,6 @@ void ChromeBrowsingDataRemoverDelegate::
CONTENT_SETTINGS_TYPE_CLIENT_HINTS, base::Time(),
base::Bind(&WebsiteSettingsFilterAdapter, filter));
@@ -720,40 +720,6 @@ void ChromeBrowsingDataRemoverDelegate::
CONTENT_SETTINGS_TYPE_CLIENT_HINTS, base::Time(),
base::Bind(&WebsiteSettingsFilterAdapter, filter));
- // Clear the safebrowsing cookies only if time period is for "all time". It
- // doesn't make sense to apply the time period of deleting in the last X
@@ -893,35 +909,32 @@
--- a/chrome/browser/notifications/platform_notification_service_impl.cc
+++ b/chrome/browser/notifications/platform_notification_service_impl.cc
@@ -26,8 +26,6 @@
@@ -27,8 +27,6 @@
#include "chrome/browser/profiles/profile_attributes_storage.h"
#include "chrome/browser/profiles/profile_io_data.h"
#include "chrome/browser/profiles/profile_manager.h"
-#include "chrome/browser/safe_browsing/ping_manager.h"
-#include "chrome/browser/safe_browsing/safe_browsing_service.h"
#include "chrome/browser/ui/browser.h"
#include "chrome/common/chrome_features.h"
#include "chrome/common/features.h"
@@ -94,18 +92,6 @@ void CancelNotification(const std::strin
notification_id));
#include "chrome/browser/ui/browser_list.h"
#include "chrome/browser/ui/browser_window.h"
@@ -81,6 +79,7 @@ namespace {
// permission without having an associated renderer process yet.
const int kInvalidRenderProcessId = -1;
+#if 0
void ReportNotificationImageOnIOThread(
scoped_refptr<safe_browsing::SafeBrowsingService> safe_browsing_service,
Profile* profile,
@@ -92,6 +91,7 @@ void ReportNotificationImageOnIOThread(
safe_browsing_service->ping_manager()->ReportNotificationImage(
profile, safe_browsing_service->database_manager(), origin, image);
}
+#endif
-void ReportNotificationImageOnIOThread(
- scoped_refptr<safe_browsing::SafeBrowsingService> safe_browsing_service,
- Profile* profile,
- const GURL& origin,
- const SkBitmap& image) {
- DCHECK_CURRENTLY_ON(BrowserThread::IO);
- if (!safe_browsing_service || !safe_browsing_service->enabled())
- return;
- safe_browsing_service->ping_manager()->ReportNotificationImage(
- profile, safe_browsing_service->database_manager(), origin, image);
-}
-
} // namespace
// static
@@ -462,13 +448,6 @@ Notification PlatformNotificationService
// Whether a web notification should be displayed when chrome is in full
// screen mode.
@@ -516,13 +516,6 @@ PlatformNotificationServiceImpl::CreateN
notification.set_type(message_center::NOTIFICATION_TYPE_IMAGE);
notification.set_image(
gfx::Image::CreateFrom1xBitmap(notification_resources.image));
@@ -999,7 +1012,7 @@
#include "chrome/browser/sync/chrome_sync_client.h"
#include "chrome/browser/sync/profile_sync_service_factory.h"
#include "chrome/browser/translate/translate_ranker_metrics_provider.h"
@@ -661,9 +660,6 @@ void ChromeMetricsServiceClient::Registe
@@ -699,9 +698,6 @@ void ChromeMetricsServiceClient::Registe
metrics_service_->RegisterMetricsProvider(
base::MakeUnique<HttpsEngagementMetricsProvider>());
@@ -1025,17 +1038,17 @@
// WebContentsObserver implementation. Sets a flag so that when the database
--- a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
+++ b/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
@@ -208,7 +208,6 @@ EnsureBrowserContextKeyedServiceFactorie
@@ -214,7 +214,6 @@ EnsureBrowserContextKeyedServiceFactorie
#if BUILDFLAG(ENABLE_CAPTIVE_PORTAL_DETECTION)
CaptivePortalServiceFactory::GetInstance();
#endif
- CertificateReportingServiceFactory::GetInstance();
#if defined(OS_ANDROID)
chrome::android::DataUseUITabModelFactory::GetInstance();
android::DataUseUITabModelFactory::GetInstance();
#endif
--- a/chrome/browser/ssl/captive_portal_blocking_page.cc
+++ b/chrome/browser/ssl/captive_portal_blocking_page.cc
@@ -83,13 +83,6 @@ CaptivePortalBlockingPage::CaptivePortal
@@ -85,13 +85,6 @@ CaptivePortalBlockingPage::CaptivePortal
login_url_(login_url),
ssl_info_(ssl_info),
callback_(callback) {
@@ -1049,7 +1062,7 @@
captive_portal::CaptivePortalMetrics::LogCaptivePortalBlockingPageEvent(
captive_portal::CaptivePortalMetrics::SHOW_ALL);
}
@@ -207,10 +200,7 @@ void CaptivePortalBlockingPage::Populate
@@ -209,10 +202,7 @@ void CaptivePortalBlockingPage::Populate
load_time_data->SetString("explanationParagraph", base::string16());
load_time_data->SetString("finalParagraph", base::string16());
@@ -1061,7 +1074,7 @@
}
void CaptivePortalBlockingPage::CommandReceived(const std::string& command) {
@@ -285,12 +275,6 @@ void CaptivePortalBlockingPage::OnProcee
@@ -287,12 +277,6 @@ void CaptivePortalBlockingPage::OnProcee
void CaptivePortalBlockingPage::OnDontProceed() {
UpdateMetricsAfterSecurityInterstitial();
@@ -1087,7 +1100,7 @@
void CertReportHelper::SetSSLCertReporterForTesting(
--- a/chrome/browser/ui/tab_helpers.cc
+++ b/chrome/browser/ui/tab_helpers.cc
@@ -274,11 +274,6 @@ void TabHelpers::AttachTabHelpers(WebCon
@@ -288,11 +288,6 @@ void TabHelpers::AttachTabHelpers(WebCon
new ChromePDFWebContentsHelperClient()));
PluginObserver::CreateForWebContents(web_contents);
SadTabHelper::CreateForWebContents(web_contents);
@@ -1096,12 +1109,12 @@
- web_contents);
- safe_browsing::TriggerCreator::MaybeCreateTriggersForWebContents(
- profile, web_contents);
TabContentsSyncedTabDelegate::CreateForWebContents(web_contents);
TabDialogs::CreateForWebContents(web_contents);
ThumbnailTabHelper::CreateForWebContents(web_contents);
SearchTabHelper::CreateForWebContents(web_contents);
if (base::FeatureList::IsEnabled(features::kTabMetricsLogging))
TabActivityWatcher::WatchWebContents(web_contents);
--- a/chrome/browser/permissions/permission_decision_auto_blocker.cc
+++ b/chrome/browser/permissions/permission_decision_auto_blocker.cc
@@ -16,7 +16,6 @@
@@ -18,7 +18,6 @@
#include "chrome/browser/permissions/permission_util.h"
#include "chrome/browser/profiles/incognito_helpers.h"
#include "chrome/browser/profiles/profile.h"
@@ -1109,7 +1122,7 @@
#include "chrome/common/chrome_features.h"
#include "components/keyed_service/content/browser_context_dependency_manager.h"
#include "components/safe_browsing/db/database_manager.h"
@@ -431,10 +430,6 @@ PermissionDecisionAutoBlocker::Permissio
@@ -422,10 +421,6 @@ PermissionDecisionAutoBlocker::Permissio
db_manager_(nullptr),
safe_browsing_timeout_(kCheckUrlTimeoutMs),
clock_(new base::DefaultClock()) {
@@ -1263,7 +1276,7 @@
sources = [
"chrome_cleaner/chrome_cleaner_controller_impl_win.cc",
"chrome_cleaner/chrome_cleaner_controller_impl_win.h",
@@ -70,6 +75,7 @@ static_library("safe_browsing") {
@@ -73,6 +78,7 @@ static_library("safe_browsing") {
]
deps += [ "//components/keep_alive_registry" ]
}
@@ -1273,7 +1286,7 @@
# "Safe Browsing Basic" files used for safe browsing in full mode
--- a/chrome/browser/net/system_network_context_manager.cc
+++ b/chrome/browser/net/system_network_context_manager.cc
@@ -49,17 +49,11 @@ content::mojom::NetworkContextParamsPtr
@@ -50,17 +50,11 @@ content::mojom::NetworkContextParamsPtr
// Called on IOThread to disable QUIC for HttpNetworkSessions not using the
// network service. Note that re-enabling QUIC dynamically is not supported for
// simpliciy and requires a browser restart.
@@ -1292,7 +1305,7 @@
}
} // namespace
@@ -131,11 +125,7 @@ void SystemNetworkContextManager::Disabl
@@ -132,11 +126,7 @@ void SystemNetworkContextManager::Disabl
if (!io_thread)
return;
@@ -1307,7 +1320,7 @@
}
--- a/chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc
+++ b/chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc
@@ -401,9 +401,8 @@ void AddBluetoothStrings(content::WebUID
@@ -405,9 +405,8 @@ void AddBluetoothStrings(content::WebUID
#endif
void AddChangePasswordStrings(content::WebUIDataSource* html_source) {
@@ -1326,20 +1339,19 @@
#include "chrome/renderer/prerender/prerender_helper.h"
#include "chrome/renderer/prerender/prerenderer_client.h"
-#include "chrome/renderer/safe_browsing/phishing_classifier_delegate.h"
#include "chrome/renderer/searchbox/search_bouncer.h"
#include "chrome/renderer/searchbox/searchbox.h"
#include "chrome/renderer/searchbox/searchbox_extension.h"
@@ -82,9 +81,6 @@
#include "chrome/renderer/tts_dispatcher.h"
#include "chrome/renderer/worker_content_settings_client.h"
#include "components/autofill/content/renderer/autofill_agent.h"
@@ -79,8 +78,6 @@
#include "components/network_hints/renderer/prescient_networking_dispatcher.h"
#include "components/password_manager/content/renderer/credential_manager_client.h"
#include "components/pdf/renderer/pepper_pdf_host.h"
-#include "components/safe_browsing/renderer/renderer_url_loader_throttle.h"
-#include "components/safe_browsing/renderer/threat_dom_details.h"
-#include "components/safe_browsing/renderer/websocket_sb_handshake_throttle.h"
#include "components/signin/core/common/profile_management_switches.h"
#include "components/safe_browsing/renderer/websocket_sb_handshake_throttle.h"
#include "components/spellcheck/spellcheck_build_features.h"
#include "components/startup_metric_utils/common/startup_metric.mojom.h"
@@ -449,9 +445,6 @@ void ChromeContentRendererClient::Render
@@ -449,9 +446,6 @@ void ChromeContentRendererClient::Render
thread->AddObserver(spellcheck_.get());
}
#endif
@@ -1349,7 +1361,7 @@
prerender_dispatcher_.reset(new prerender::PrerenderDispatcher());
subresource_filter_ruleset_dealer_.reset(
new subresource_filter::UnverifiedRulesetDealer());
@@ -564,10 +557,6 @@ void ChromeContentRendererClient::Render
@@ -566,10 +560,6 @@ void ChromeContentRendererClient::Render
new nacl::NaClHelper(render_frame);
#endif
@@ -1360,7 +1372,7 @@
#if BUILDFLAG(ENABLE_PRINTING)
new printing::PrintRenderFrameHelper(
render_frame, base::MakeUnique<ChromePrintRenderFrameHelperDelegate>());
@@ -1282,16 +1271,6 @@ bool ChromeContentRendererClient::WillSe
@@ -1316,16 +1306,6 @@ bool ChromeContentRendererClient::WillSe
const blink::WebURL& url,
std::vector<std::unique_ptr<content::URLLoaderThrottle>>* throttles,
GURL* new_url) {
@@ -1377,18 +1389,18 @@
// Check whether the request should be allowed. If not allowed, we reset the
// URL to something invalid to prevent the request and cause an error.
#if BUILDFLAG(ENABLE_EXTENSIONS)
@@ -1387,9 +1366,7 @@ bool ChromeContentRendererClient::IsExte
@@ -1423,9 +1403,7 @@ bool ChromeContentRendererClient::IsExte
std::unique_ptr<blink::WebSocketHandshakeThrottle>
ChromeContentRendererClient::CreateWebSocketHandshakeThrottle() {
- InitSafeBrowsingIfNecessary();
- return base::MakeUnique<safe_browsing::WebSocketSBHandshakeThrottle>(
- safe_browsing_.get());
+ return nullptr;
+ return std::unique_ptr<blink::WebSocketHandshakeThrottle>(nullptr);
}
std::unique_ptr<blink::WebSpeechSynthesizer>
@@ -1681,13 +1658,6 @@ ChromeContentRendererClient::GetTaskSche
@@ -1717,13 +1695,6 @@ ChromeContentRendererClient::GetTaskSche
GetRendererTaskSchedulerInitParamsFromCommandLine();
}
@@ -1404,23 +1416,15 @@
base::Time cert_validity_start,
--- a/chrome/renderer/chrome_content_renderer_client.h
+++ b/chrome/renderer/chrome_content_renderer_client.h
@@ -19,7 +19,6 @@
@@ -20,7 +20,6 @@
#include "chrome/renderer/media/chrome_key_systems_provider.h"
#include "components/nacl/common/features.h"
#include "components/rappor/public/interfaces/rappor_recorder.mojom.h"
-#include "components/safe_browsing/common/safe_browsing.mojom.h"
#include "components/spellcheck/spellcheck_build_features.h"
#include "content/public/renderer/content_renderer_client.h"
#include "extensions/features/features.h"
@@ -27,6 +26,7 @@
#include "media/media_features.h"
#include "ppapi/features/features.h"
#include "printing/features/features.h"
+#include "third_party/WebKit/public/platform/WebSocketHandshakeThrottle.h"
#include "v8/include/v8.h"
#if defined (OS_CHROMEOS)
@@ -70,10 +70,6 @@ namespace prerender {
#include "content/public/renderer/render_thread.h"
@@ -71,10 +70,6 @@ namespace prerender {
class PrerenderDispatcher;
}
@@ -1431,9 +1435,9 @@
namespace subresource_filter {
class UnverifiedRulesetDealer;
}
@@ -244,9 +240,6 @@ class ChromeContentRendererClient : publ
static GURL GetNaClContentHandlerURL(const std::string& actual_mime_type,
const content::WebPluginInfo& plugin);
@@ -255,9 +250,6 @@ class ChromeContentRendererClient
void GetInterface(const std::string& name,
mojo::ScopedMessagePipeHandle request_handle) override;
- // Initialises |safe_browsing_| if it is not already initialised.
- void InitSafeBrowsingIfNecessary();
@@ -1441,9 +1445,9 @@
void GetNavigationErrorStringsInternal(
content::RenderFrame* render_frame,
const blink::WebURLRequest& failed_request,
@@ -278,12 +271,9 @@ class ChromeContentRendererClient : publ
@@ -289,12 +281,9 @@ class ChromeContentRendererClient
chrome::ChromeKeySystemsProvider key_systems_provider_;
ChromeKeySystemsProvider key_systems_provider_;
- safe_browsing::mojom::SafeBrowsingPtr safe_browsing_;
-

18
resources/patches/inox-patchset/0005-disable-default-extensions.patch
View File

@@ -1,6 +1,6 @@
--- a/chrome/browser/extensions/component_loader.cc
+++ b/chrome/browser/extensions/component_loader.cc
@@ -441,11 +441,6 @@ void ComponentLoader::AddWebStoreApp() {
@@ -422,11 +422,6 @@ void ComponentLoader::AddWebStoreApp() {
if (!IsNormalSession())
return;
#endif
@@ -12,7 +12,7 @@
}
scoped_refptr<const Extension> ComponentLoader::CreateExtension(
@@ -500,11 +495,6 @@ void ComponentLoader::AddDefaultComponen
@@ -481,11 +476,6 @@ void ComponentLoader::AddDefaultComponen
Add(IDR_BOOKMARKS_MANIFEST,
base::FilePath(FILE_PATH_LITERAL("bookmark_manager")));
}
@@ -24,9 +24,9 @@
#endif // defined(OS_CHROMEOS)
if (!skip_session_components) {
@@ -582,13 +572,6 @@ void ComponentLoader::AddDefaultComponen
AddHotwordAudioVerificationApp();
AddHotwordHelperExtension();
@@ -561,13 +551,6 @@ void ComponentLoader::AddDefaultComponen
AddHangoutServicesExtension();
AddImageLoaderExtension();
-
- bool install_feedback = enable_background_extensions_during_testing;
@@ -40,16 +40,13 @@
#if defined(OS_CHROMEOS)
--- a/chrome/browser/extensions/external_component_loader.cc
+++ b/chrome/browser/extensions/external_component_loader.cc
@@ -34,12 +34,6 @@ ExternalComponentLoader::~ExternalCompon
@@ -31,9 +31,6 @@ ExternalComponentLoader::~ExternalCompon
void ExternalComponentLoader::StartLoading() {
auto prefs = std::make_unique<base::DictionaryValue>();
-#if defined(GOOGLE_CHROME_BUILD)
- AddExternalExtension(extension_misc::kInAppPaymentsSupportAppId, prefs.get());
-#endif // defined(GOOGLE_CHROME_BUILD)
-
- if (HotwordServiceFactory::IsHotwordAllowed(profile_))
- AddExternalExtension(extension_misc::kHotwordSharedModuleId, prefs.get());
#if defined(OS_CHROMEOS)
{
@@ -89,11 +86,10 @@
void WebstoreInstaller::ReportFailure(const std::string& error,
--- a/chrome/browser/extensions/component_extensions_whitelist/whitelist.cc
+++ b/chrome/browser/extensions/component_extensions_whitelist/whitelist.cc
@@ -26,8 +26,6 @@ namespace extensions {
@@ -26,7 +26,6 @@ namespace extensions {
bool IsComponentExtensionWhitelisted(const std::string& extension_id) {
const char* const kAllowed[] = {
- extension_misc::kHotwordSharedModuleId,
- extension_misc::kInAppPaymentsSupportAppId,
extension_misc::kMediaRouterStableExtensionId,
extension_misc::kPdfExtensionId,

24
resources/patches/inox-patchset/0006-modify-default-prefs.patch
View File

@@ -1,6 +1,6 @@
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -866,7 +866,7 @@ void ChromeContentBrowserClient::Registe
@@ -879,7 +879,7 @@ void ChromeContentBrowserClient::Registe
void ChromeContentBrowserClient::RegisterProfilePrefs(
user_prefs::PrefRegistrySyncable* registry) {
registry->RegisterBooleanPref(prefs::kDisable3DAPIs, false);
@@ -11,12 +11,12 @@
--- a/chrome/browser/ui/browser_ui_prefs.cc
+++ b/chrome/browser/ui/browser_ui_prefs.cc
@@ -62,11 +62,11 @@ void RegisterBrowserUserPrefs(user_prefs
@@ -59,11 +59,11 @@ void RegisterBrowserUserPrefs(user_prefs
registry->RegisterBooleanPref(prefs::kWebAppCreateInAppsMenu, true);
registry->RegisterBooleanPref(prefs::kWebAppCreateInQuickLaunchBar, true);
registry->RegisterBooleanPref(
prefs::kEnableTranslate,
- true,
+ false,
- prefs::kOfferTranslateEnabled, true,
+ prefs::kOfferTranslateEnabled, false,
user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
registry->RegisterStringPref(prefs::kCloudPrintEmail, std::string());
registry->RegisterBooleanPref(prefs::kCloudPrintProxyEnabled, true);
@@ -60,7 +60,7 @@
void BackgroundModeManager::RegisterProfile(Profile* profile) {
--- a/components/content_settings/core/browser/cookie_settings.cc
+++ b/components/content_settings/core/browser/cookie_settings.cc
@@ -80,7 +80,7 @@ void CookieSettings::GetCookieSettings(
@@ -88,7 +88,7 @@ void CookieSettings::GetCookieSettings(
void CookieSettings::RegisterProfilePrefs(
user_prefs::PrefRegistrySyncable* registry) {
registry->RegisterBooleanPref(
@@ -82,7 +82,7 @@
--- a/components/autofill/core/browser/autofill_manager.cc
+++ b/components/autofill/core/browser/autofill_manager.cc
@@ -281,7 +281,7 @@ void AutofillManager::RegisterProfilePre
@@ -217,7 +217,7 @@ void AutofillManager::RegisterProfilePre
registry->RegisterIntegerPref(
prefs::kAutofillCreditCardSigninPromoImpressionCount, 0);
registry->RegisterBooleanPref(
@@ -104,7 +104,7 @@
</dialog>
--- a/chrome/browser/io_thread.cc
+++ b/chrome/browser/io_thread.cc
@@ -610,7 +610,7 @@ void IOThread::RegisterPrefs(PrefRegistr
@@ -612,7 +612,7 @@ void IOThread::RegisterPrefs(PrefRegistr
std::string());
registry->RegisterBooleanPref(prefs::kEnableReferrers, true);
data_reduction_proxy::RegisterPrefs(registry);
@@ -112,10 +112,10 @@
+ registry->RegisterBooleanPref(prefs::kBuiltInDnsClientEnabled, false);
registry->RegisterBooleanPref(prefs::kQuickCheckEnabled, true);
registry->RegisterBooleanPref(prefs::kPacHttpsUrlStrippingEnabled, true);
}
#if defined(OS_POSIX)
--- a/chrome/browser/signin/signin_promo.cc
+++ b/chrome/browser/signin/signin_promo.cc
@@ -328,8 +328,8 @@ void ForceWebBasedSigninFlowForTesting(b
@@ -390,8 +390,8 @@ void ForceWebBasedSigninFlowForTesting(b
void RegisterProfilePrefs(
user_prefs::PrefRegistrySyncable* registry) {
registry->RegisterIntegerPref(prefs::kSignInPromoStartupCount, 0);
@@ -197,7 +197,7 @@
// functionality that are only available in chrome://extensions/ but which
--- a/components/safe_browsing/common/safe_browsing_prefs.cc
+++ b/components/safe_browsing/common/safe_browsing_prefs.cc
@@ -370,9 +370,9 @@ void RegisterProfilePrefs(PrefRegistrySi
@@ -334,9 +334,9 @@ void RegisterProfilePrefs(PrefRegistrySi
registry->RegisterBooleanPref(
prefs::kSafeBrowsingSawInterstitialScoutReporting, false);
registry->RegisterBooleanPref(
@@ -211,7 +211,7 @@
false);
--- a/components/password_manager/core/browser/password_manager.cc
+++ b/components/password_manager/core/browser/password_manager.cc
@@ -207,10 +207,10 @@ PasswordFormManager* FindMatchedManager(
@@ -235,10 +235,10 @@ PasswordFormManager* FindMatchedManager(
void PasswordManager::RegisterProfilePrefs(
user_prefs::PrefRegistrySyncable* registry) {
registry->RegisterBooleanPref(

49
resources/patches/inox-patchset/0007-disable-web-resource-service.patch
View File

@@ -1,47 +1,18 @@
--- a/components/web_resource/web_resource_service.cc
+++ b/components/web_resource/web_resource_service.cc
@@ -126,44 +126,7 @@ bool WebResourceService::GetFetchSchedul
@@ -126,6 +126,7 @@ bool WebResourceService::GetFetchSchedul
// Initializes the fetching of data from the resource server. Data
// load calls OnURLFetchComplete.
void WebResourceService::StartFetch() {
- // Set to false so that next fetch can be scheduled after this fetch or
- // if we recieve notification that resource is allowed.
- fetch_scheduled_ = false;
- // Check whether fetching is allowed.
- if (!resource_request_allowed_notifier_->ResourceRequestsAllowed())
- return;
-
- // First, put our next cache load on the MessageLoop.
- ScheduleFetch(cache_update_delay_ms_);
-
- // Set cache update time in preferences.
- prefs_->SetString(last_update_time_pref_name_,
- base::DoubleToString(base::Time::Now().ToDoubleT()));
-
- // If we are still fetching data, exit.
- if (in_fetch_)
- return;
- in_fetch_ = true;
-
- GURL web_resource_server =
- application_locale_.empty()
- ? web_resource_server_
- : google_util::AppendGoogleLocaleParam(web_resource_server_,
- application_locale_);
-
- DVLOG(1) << "WebResourceService StartFetch " << web_resource_server;
- url_fetcher_ = net::URLFetcher::Create(
- web_resource_server, net::URLFetcher::GET, this, traffic_annotation_);
- data_use_measurement::DataUseUserData::AttachToFetcher(
- url_fetcher_.get(),
- data_use_measurement::DataUseUserData::WEB_RESOURCE_SERVICE);
- // Do not let url fetcher affect existing state in system context
- // (by setting cookies, for example).
- url_fetcher_->SetLoadFlags(net::LOAD_DISABLE_CACHE |
- net::LOAD_DO_NOT_SEND_COOKIES |
- net::LOAD_DO_NOT_SAVE_COOKIES);
- url_fetcher_->SetRequestContext(request_context_.get());
- url_fetcher_->Start();
+#if 0
// Set to false so that next fetch can be scheduled after this fetch or
// if we recieve notification that resource is allowed.
fetch_scheduled_ = false;
@@ -164,6 +165,8 @@ void WebResourceService::StartFetch() {
net::LOAD_DO_NOT_SAVE_COOKIES);
url_fetcher_->SetRequestContext(request_context_.get());
url_fetcher_->Start();
+#endif
+ in_fetch_ = false;
}

44
resources/patches/inox-patchset/0008-restore-classic-ntp.patch
View File

@@ -1,24 +1,36 @@
--- a/chrome/browser/search/search.cc
+++ b/chrome/browser/search/search.cc
@@ -170,17 +170,7 @@ struct NewTabURLDetails {
return NewTabURLDetails(local_url, NEW_TAB_URL_VALID);
@@ -147,29 +147,7 @@ struct NewTabURLDetails {
NewTabURLState state = IsValidNewTabURL(profile, search_provider_url);
- switch (state) {
- case NEW_TAB_URL_VALID:
- // We can use the search provider's page.
- return NewTabURLDetails(search_provider_url, state);
- case NEW_TAB_URL_INCOGNITO:
- // Incognito has its own New Tab.
- return NewTabURLDetails(GURL(), state);
- default:
- // Use the local New Tab otherwise.
- return NewTabURLDetails(local_url, state);
- }
+ return NewTabURLDetails(local_url, state);
const GURL local_url(chrome::kChromeSearchLocalNtpUrl);
- if (ShouldShowLocalNewTab(profile))
- return NewTabURLDetails(local_url, NEW_TAB_URL_VALID);
-
- const TemplateURL* template_url =
- GetDefaultSearchProviderTemplateURL(profile);
- if (!profile || !template_url)
- return NewTabURLDetails(local_url, NEW_TAB_URL_BAD);
-
- GURL search_provider_url(template_url->new_tab_url_ref().ReplaceSearchTerms(
- TemplateURLRef::SearchTermsArgs(base::string16()),
- UIThreadSearchTermsData(profile)));
-
- if (ShouldDelayRemoteNTP(search_provider_url, profile))
- return NewTabURLDetails(local_url, NEW_TAB_URL_VALID);
-
- if (!search_provider_url.is_valid())
- return NewTabURLDetails(local_url, NEW_TAB_URL_NOT_SET);
- if (!search_provider_url.SchemeIsCryptographic())
- return NewTabURLDetails(local_url, NEW_TAB_URL_INSECURE);
- if (!IsURLAllowedForSupervisedUser(search_provider_url, profile))
- return NewTabURLDetails(local_url, NEW_TAB_URL_BLOCKED);
-
- return NewTabURLDetails(search_provider_url, NEW_TAB_URL_VALID);
+ return NewTabURLDetails(local_url, NEW_TAB_URL_VALID);
}
GURL url;
const GURL url;
--- a/components/ntp_snippets/features.cc
+++ b/components/ntp_snippets/features.cc
@@ -38,16 +38,16 @@ const base::Feature* const kAllFeatures[

8
resources/patches/inox-patchset/0014-disable-translation-lang-fetch.patch
View File

@@ -1,6 +1,6 @@
--- a/components/translate/core/browser/translate_language_list.cc
+++ b/components/translate/core/browser/translate_language_list.cc
@@ -206,6 +206,8 @@ GURL TranslateLanguageList::TranslateLan
@@ -207,6 +207,8 @@ GURL TranslateLanguageList::TranslateLan
}
void TranslateLanguageList::RequestLanguageList() {
@@ -31,7 +31,7 @@
}
--- a/components/translate/core/browser/translate_ranker_impl.cc
+++ b/components/translate/core/browser/translate_ranker_impl.cc
@@ -148,14 +148,10 @@ TranslateRankerImpl::TranslateRankerImpl
@@ -150,14 +150,10 @@ TranslateRankerImpl::TranslateRankerImpl
ukm::UkmRecorder* ukm_recorder)
: ukm_recorder_(ukm_recorder),
is_logging_enabled_(false),
@@ -49,8 +49,8 @@
+ is_previous_language_matches_override_enabled_(false),
weak_ptr_factory_(this) {
if (is_query_enabled_ || is_enforcement_enabled_) {
model_loader_ = base::MakeUnique<machine_intelligence::RankerModelLoader>(
@@ -229,6 +225,8 @@ bool TranslateRankerImpl::ShouldOfferTra
model_loader_ = base::MakeUnique<assist_ranker::RankerModelLoaderImpl>(
@@ -231,6 +227,8 @@ bool TranslateRankerImpl::ShouldOfferTra
// (or become False).
const bool kDefaultResponse = true;

2
resources/patches/inox-patchset/0016-chromium-sandbox-pie.patch
View File

@@ -1,6 +1,6 @@
--- a/sandbox/linux/BUILD.gn
+++ b/sandbox/linux/BUILD.gn
@@ -313,6 +313,12 @@ if (is_linux) {
@@ -315,6 +315,12 @@ if (is_linux) {
# These files have a suspicious comparison.
# TODO fix this and re-enable this warning.
"-Wno-sign-compare",

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

@@ -1,6 +1,6 @@
--- a/components/signin/core/browser/signin_manager.cc
+++ b/components/signin/core/browser/signin_manager.cc
@@ -289,7 +289,7 @@ void SigninManager::OnGoogleServicesUser
@@ -299,7 +299,7 @@ void SigninManager::OnGoogleServicesUser
}
bool SigninManager::IsSigninAllowed() const {

73
resources/patches/inox-patchset/9000-disable-metrics.patch
View File

@@ -1,6 +1,6 @@
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -1215,6 +1215,11 @@ const FeatureEntry::FeatureVariation kSp
@@ -1211,6 +1211,11 @@ const FeatureEntry::FeatureVariation kSp
//
// When adding a new choice, add it to the end of the list.
const FeatureEntry kFeatureEntries[] = {
@@ -14,7 +14,7 @@
SINGLE_VALUE_TYPE(switches::kIgnoreGpuBlacklist)},
--- a/base/metrics/histogram_base.h
+++ b/base/metrics/histogram_base.h
@@ -84,6 +84,12 @@ BASE_EXPORT HistogramBase* DeserializeHi
@@ -94,6 +94,12 @@ BASE_EXPORT HistogramBase* DeserializeHi
class BASE_EXPORT HistogramBase {
public:
@@ -29,15 +29,15 @@
typedef int32_t Count; // Used to manipulate counts in temporaries.
--- a/base/metrics/histogram_base.cc
+++ b/base/metrics/histogram_base.cc
@@ -9,6 +9,7 @@
#include <memory>
@@ -10,6 +10,7 @@
#include <set>
#include <utility>
+#include "base/command_line.h"
#include "base/json/json_string_value_serializer.h"
#include "base/lazy_instance.h"
#include "base/logging.h"
#include "base/metrics/histogram.h"
@@ -60,6 +61,12 @@ HistogramBase* DeserializeHistogramInfo(
@@ -64,6 +65,12 @@ HistogramBase* DeserializeHistogramInfo(
}
}
@@ -48,8 +48,8 @@
+}
+
const HistogramBase::Sample HistogramBase::kSampleType_MAX = INT_MAX;
HistogramBase* HistogramBase::report_histogram_ = nullptr;
HistogramBase::HistogramBase(const char* name)
--- a/base/metrics/histogram.cc
+++ b/base/metrics/histogram.cc
@@ -124,7 +124,8 @@ class Histogram::Factory {
@@ -91,8 +91,8 @@
minimum_,
maximum_,
registered_ranges,
@@ -232,6 +238,10 @@ HistogramBase* Histogram::Factory::Build
ReportHistogramActivity(*histogram, HISTOGRAM_LOOKUP);
@@ -226,6 +232,10 @@ HistogramBase* Histogram::Factory::Build
}
}
+ if (!enabled_)
@@ -102,7 +102,7 @@
CHECK_EQ(histogram_type_, histogram->GetHistogramType()) << name_;
if (bucket_count_ != 0 &&
!histogram->HasConstructionArguments(minimum_, maximum_, bucket_count_)) {
@@ -468,10 +478,16 @@ bool Histogram::HasConstructionArguments
@@ -462,10 +472,16 @@ bool Histogram::HasConstructionArguments
}
void Histogram::Add(int value) {
@@ -119,7 +119,7 @@
DCHECK_EQ(0, ranges(0));
DCHECK_EQ(kSampleType_MAX, ranges(bucket_count()));
@@ -526,10 +542,16 @@ std::unique_ptr<HistogramSamples> Histog
@@ -520,10 +536,16 @@ std::unique_ptr<HistogramSamples> Histog
}
void Histogram::AddSamples(const HistogramSamples& samples) {
@@ -165,13 +165,13 @@
DCHECK(!histogram_ref); // Should never have been set.
DCHECK(!allocator); // Shouldn't have failed.
flags &= ~HistogramBase::kIsPersistent;
- tentative_histogram.reset(new SparseHistogram(name));
+ tentative_histogram.reset(new SparseHistogram(overridden_name));
- tentative_histogram.reset(new SparseHistogram(GetPermanentName(name)));
+ tentative_histogram.reset(new SparseHistogram(GetPermanentName(overridden_name)));
tentative_histogram->SetFlags(flags);
}
@@ -68,6 +73,10 @@ HistogramBase* SparseHistogram::FactoryG
ReportHistogramActivity(*histogram, HISTOGRAM_LOOKUP);
@@ -64,6 +69,10 @@ HistogramBase* SparseHistogram::FactoryG
}
}
+ if (!enabled_)
@@ -181,7 +181,7 @@
CHECK_EQ(SPARSE_HISTOGRAM, histogram->GetHistogramType());
return histogram;
}
@@ -101,10 +110,16 @@ bool SparseHistogram::HasConstructionArg
@@ -97,10 +106,16 @@ bool SparseHistogram::HasConstructionArg
}
void SparseHistogram::Add(Sample value) {
@@ -198,7 +198,7 @@
if (count <= 0) {
NOTREACHED();
return;
@@ -150,11 +165,17 @@ std::unique_ptr<HistogramSamples> Sparse
@@ -146,11 +161,17 @@ std::unique_ptr<HistogramSamples> Sparse
}
void SparseHistogram::AddSamples(const HistogramSamples& samples) {
@@ -268,7 +268,7 @@
#include "base/location.h"
#include "base/memory/ptr_util.h"
#include "base/metrics/histogram_base.h"
@@ -809,6 +810,8 @@ bool MetricsService::UmaMetricsProperlyS
@@ -802,6 +803,8 @@ bool MetricsService::UmaMetricsProperlyS
void MetricsService::RegisterMetricsProvider(
std::unique_ptr<MetricsProvider> provider) {
DCHECK_EQ(INITIALIZED, state_);
@@ -279,7 +279,20 @@
--- a/chrome/browser/ui/tab_helpers.cc
+++ b/chrome/browser/ui/tab_helpers.cc
@@ -215,13 +215,17 @@ void TabHelpers::AttachTabHelpers(WebCon
@@ -204,8 +204,10 @@ void TabHelpers::AttachTabHelpers(WebCon
ChromeTranslateClient::CreateForWebContents(web_contents);
ClientHintsObserver::CreateForWebContents(web_contents);
CoreTabHelper::CreateForWebContents(web_contents);
- data_use_measurement::DataUseWebContentsObserver::CreateForWebContents(
- web_contents);
+ if (base::CommandLine::ForCurrentProcess()->HasSwitch("enable-metrics")) {
+ data_use_measurement::DataUseWebContentsObserver::CreateForWebContents(
+ web_contents);
+ }
ExternalProtocolObserver::CreateForWebContents(web_contents);
favicon::CreateContentFaviconDriverForWebContents(web_contents);
FindTabHelper::CreateForWebContents(web_contents);
@@ -220,14 +222,20 @@ void TabHelpers::AttachTabHelpers(WebCon
HistoryTabHelper::CreateForWebContents(web_contents);
InfoBarService::CreateForWebContents(web_contents);
InstallableManager::CreateForWebContents(web_contents);
@@ -288,20 +301,34 @@
+ if (base::CommandLine::ForCurrentProcess()->HasSwitch("enable-metrics")) {
+ metrics::RendererUptimeWebContentsObserver::CreateForWebContents(
+ web_contents);
+ }
+ };
if (content::IsBrowserSideNavigationEnabled())
MixedContentSettingsTabHelper::CreateForWebContents(web_contents);
NavigationCorrectionTabObserver::CreateForWebContents(web_contents);
- NavigationMetricsRecorder::CreateForWebContents(web_contents);
- chrome::InitializePageLoadMetricsForWebContents(web_contents);
+ if (base::CommandLine::ForCurrentProcess()->HasSwitch("enable-metrics")) {
+ NavigationMetricsRecorder::CreateForWebContents(web_contents);
+ };
OutOfMemoryReporter::CreateForWebContents(web_contents);
- chrome::InitializePageLoadMetricsForWebContents(web_contents);
+ if (base::CommandLine::ForCurrentProcess()->HasSwitch("enable-metrics")) {
+ chrome::InitializePageLoadMetricsForWebContents(web_contents);
+ }
PDFPluginPlaceholderObserver::CreateForWebContents(web_contents);
PermissionRequestManager::CreateForWebContents(web_contents);
PopupBlockerTabHelper::CreateForWebContents(web_contents);
@@ -285,7 +289,8 @@ void TabHelpers::AttachTabHelpers(WebCon
// The PopupBlockerTabHelper has an implicit dependency on
@@ -252,7 +260,9 @@ void TabHelpers::AttachTabHelpers(WebCon
// is taken over by ChromeContentSettingsClient. http://crbug.com/387075
TabSpecificContentSettings::CreateForWebContents(web_contents);
TabUIHelper::CreateForWebContents(web_contents);
- ukm::InitializeSourceUrlRecorderForWebContents(web_contents);
+ if (base::CommandLine::ForCurrentProcess()->HasSwitch("enable-metrics")) {
+ ukm::InitializeSourceUrlRecorderForWebContents(web_contents);
+ }
vr::VrTabHelper::CreateForWebContents(web_contents);
// NO! Do not just add your tab helper here. This is a large alphabetized
@@ -302,7 +312,8 @@ void TabHelpers::AttachTabHelpers(WebCon
#if defined(OS_WIN) || defined(OS_MACOSX) || \
(defined(OS_LINUX) && !defined(OS_CHROMEOS))

30
resources/patches/inox-patchset/chromium-FORTIFY_SOURCE-r2.patch Normal file
View File

@@ -0,0 +1,30 @@
Drop _FORTIFY_SOURCE=2 from defines
Gentoo toolchains enable this by default. Removing this prevents spammy
warnings about the macro being redefined.
--- a/build/config/compiler/BUILD.gn
+++ b/build/config/compiler/BUILD.gn
@@ -1213,22 +1213,6 @@
"__STDC_FORMAT_MACROS",
]
- if (!is_debug && !using_sanitizer &&
- (!is_linux || !is_clang || is_official_build) &&
- current_cpu != "s390x" && current_cpu != "s390" &&
- current_cpu != "ppc64" && current_cpu != "ppc64" &&
- current_cpu != "mips" && current_cpu != "mips64") {
- # _FORTIFY_SOURCE isn't really supported by Clang now, see
- # http://llvm.org/bugs/show_bug.cgi?id=16821.
- # It seems to work fine with Ubuntu 12 headers though, so use it in
- # official builds.
- #
- # Non-chromium code is not guaranteed to compile cleanly with
- # _FORTIFY_SOURCE. Also, fortified build may fail when optimizations are
- # disabled, so only do that for Release build.
- defines += [ "_FORTIFY_SOURCE=2" ]
- }
-
if (is_mac || is_ios) {
cflags_objc = [ "-Wobjc-missing-property-synthesis" ]
cflags_objcc = [ "-Wobjc-missing-property-synthesis" ]

83
resources/patches/inox-patchset/chromium-angle-r0.patch Normal file
View File

@@ -0,0 +1,83 @@
From 030017a4855c7b6e7f2ff8d9566c146f31eb301b Mon Sep 17 00:00:00 2001
From: Kai Ninomiya <kainino@chromium.org>
Date: Wed, 06 Dec 2017 14:06:53 -0800
Subject: [PATCH] Mark StaticType related functions as constexpr
Fixes compilation on some versions of GCC and probably Clang.
Follow-up to http://crrev.com/c/786317
Bug: angleproject:1432
Change-Id: I3fc3ad0f65492f9543eb27fcdce6ca29a9ad06e5
Reviewed-on: https://chromium-review.googlesource.com/812220
Reviewed-by: Jamie Madill <jmadill@chromium.org>
Commit-Queue: Kai Ninomiya <kainino@chromium.org>
---
--- a/third_party/angle/src/compiler/translator/StaticType.h
+++ b/third_party/angle/src/compiler/translator/StaticType.h
@@ -160,7 +160,7 @@ template <TBasicType basicType,
TPrecision precision,
TQualifier qualifier,
unsigned char secondarySize>
-const TType *GetForVecMatHelper(unsigned char primarySize)
+constexpr const TType *GetForVecMatHelper(unsigned char primarySize)
{
static_assert(basicType == EbtFloat || basicType == EbtInt || basicType == EbtUInt ||
basicType == EbtBool,
@@ -186,7 +186,7 @@ const TType *GetForVecMatHelper(unsigned
template <TBasicType basicType,
TPrecision precision = EbpUndefined,
TQualifier qualifier = EvqGlobal>
-const TType *GetForVecMat(unsigned char primarySize, unsigned char secondarySize = 1)
+constexpr const TType *GetForVecMat(unsigned char primarySize, unsigned char secondarySize = 1)
{
static_assert(basicType == EbtFloat || basicType == EbtInt || basicType == EbtUInt ||
basicType == EbtBool,
@@ -208,7 +208,7 @@ const TType *GetForVecMat(unsigned char
}
template <TBasicType basicType, TPrecision precision = EbpUndefined>
-const TType *GetForVec(TQualifier qualifier, unsigned char size)
+constexpr const TType *GetForVec(TQualifier qualifier, unsigned char size)
{
switch (qualifier)
{
--- a/third_party/angle/src/compiler/translator/SymbolTable.cpp
+++ b/third_party/angle/src/compiler/translator/SymbolTable.cpp
@@ -189,7 +189,7 @@ TSymbolTable::~TSymbolTable()
pop();
}
-bool IsGenType(const TType *type)
+constexpr bool IsGenType(const TType *type)
{
if (type)
{
@@ -201,7 +201,7 @@ bool IsGenType(const TType *type)
return false;
}
-bool IsVecType(const TType *type)
+constexpr bool IsVecType(const TType *type)
{
if (type)
{
--- a/third_party/angle/src/compiler/translator/Types.h
+++ b/third_party/angle/src/compiler/translator/Types.h
@@ -236,13 +236,13 @@ class TType
{
}
- TBasicType getBasicType() const { return type; }
+ constexpr TBasicType getBasicType() const { return type; }
void setBasicType(TBasicType t);
TPrecision getPrecision() const { return precision; }
void setPrecision(TPrecision p) { precision = p; }
- TQualifier getQualifier() const { return qualifier; }
+ constexpr TQualifier getQualifier() const { return qualifier; }
void setQualifier(TQualifier q) { qualifier = q; }
bool isInvariant() const { return invariant; }

4
resources/patches/inox-patchset/chromium-clang-r1.patch → resources/patches/inox-patchset/chromium-clang-r2.patch
View File

@@ -1,6 +1,6 @@
--- a/build/config/compiler/BUILD.gn
+++ b/build/config/compiler/BUILD.gn
@@ -421,18 +421,6 @@ config("compiler") {
@@ -422,18 +422,6 @@ config("compiler") {
cflags += [ "-fcolor-diagnostics" ]
}
@@ -12,7 +12,7 @@
- "-Xclang",
- "-mllvm",
- "-Xclang",
- "-instcombine-lower-dbg-declare=1",
- "-instcombine-lower-dbg-declare=0",
- ]
- }
-

40
resources/patches/inox-patchset/chromium-cups-r0.patch Normal file
View File

@@ -0,0 +1,40 @@
From 3cf91d8d674a496d533aa106723a632b68ab26ba Mon Sep 17 00:00:00 2001
From: Tom Anderson <thomasanderson@chromium.org>
Date: Tue, 12 Dec 2017 23:31:56 +0000
Subject: [PATCH] Fix use_cups=false build
BUG=793801
R=thestig@chromium.org
Change-Id: I60ee6ec48d2686d0b42ca25311a9b76009ce9768
Reviewed-on: https://chromium-review.googlesource.com/823245
Reviewed-by: Lei Zhang <thestig@chromium.org>
Commit-Queue: Thomas Anderson <thomasanderson@chromium.org>
Cr-Commit-Position: refs/heads/master@{#523602}
---
chrome/service/cloud_print/print_system.cc | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
--- a/chrome/service/cloud_print/print_system.cc
+++ b/chrome/service/cloud_print/print_system.cc
@@ -5,6 +5,7 @@
#include "chrome/service/cloud_print/print_system.h"
#include "base/guid.h"
+#include "build/build_config.h"
namespace cloud_print {
@@ -35,5 +36,11 @@ std::string PrintSystem::GenerateProxyId
return base::GenerateGUID();
}
-} // namespace cloud_print
+#if defined(OS_LINUX) && !defined(USE_CUPS)
+scoped_refptr<PrintSystem> PrintSystem::CreateInstance(
+ const base::DictionaryValue*) {
+ return nullptr;
+}
+#endif
+} // namespace cloud_print

30
resources/patches/inox-patchset/chromium-disable-SharedArrayBuffer-by-default.patch
View File

@@ -1,30 +0,0 @@
From a354b4ecf2434f2f6460b33031aeaf646edf5e64 Mon Sep 17 00:00:00 2001
From: Brad Nelson <bradnelson@chromium.org>
Date: Thu, 4 Jan 2018 00:36:18 -0800
Subject: [PATCH] Disable SharedArrayBuffer by default.
BUG=chromium:798864
R=jschuh@chromium.org,binji@chromium.org
Change-Id: I5ebfae41a4b4c7e89faf071e6d009ea3d9ca30d4
Reviewed-on: https://chromium-review.googlesource.com/849429
Reviewed-by: Ben Smith <binji@chromium.org>
Reviewed-by: Justin Schuh <jschuh@chromium.org>
Reviewed-by: Darin Fisher <darin@chromium.org>
Commit-Queue: Brad Nelson <bradnelson@chromium.org>
Cr-Commit-Position: refs/heads/master@{#527460}
---
content/public/common/content_features.cc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/content/public/common/content_features.cc
+++ b/content/public/common/content_features.cc
@@ -290,7 +290,7 @@ const base::Feature kServiceWorkerScript
// http://tc39.github.io/ecmascript_sharedmem/shmem.html
const base::Feature kSharedArrayBuffer{"SharedArrayBuffer",
- base::FEATURE_ENABLED_BY_DEFAULT};
+ base::FEATURE_DISABLED_BY_DEFAULT};
// An experiment to require process isolation for the sign-in origin,
// https://accounts.google.com. Launch bug: https://crbug.com/739418.

37
resources/patches/inox-patchset/chromium-exclude_unwind_tables.patch
View File

@@ -1,32 +1,18 @@
From 1fc37227522ccd314f82ec893ed15c6129296604 Mon Sep 17 00:00:00 2001
From: Paul Jensen <pauljensen@chromium.org>
Date: Wed, 11 Oct 2017 08:37:34 -0400
Subject: [PATCH] Move exclude_unwind_tables back into declare_args
There is desire to adjust this flag manually.
BUG=762629
R=thakis@chromium.org
Change-Id: I3bd134c19270cd1f729b3ea078674e734493d4ab
---
diff --git a/build/config/compiler/compiler.gni b/build/config/compiler/compiler.gni
index ad40fd9..50e19a4 100644
--- a/build/config/compiler/compiler.gni
+++ b/build/config/compiler/compiler.gni
@@ -68,18 +68,18 @@
@@ -70,19 +70,19 @@ declare_args() {
# Whether or not we should use position independent code.
use_pic = true
+
+ # Exclude unwind tables for official builds as unwinding can be done from
+ # stack dumps produced by Crashpad at a later time "offline" in the crash
+ # server. For unofficial (e.g. development) builds and non-Chrome branded
+ # (e.g. Cronet which doesn't use Crashpad, crbug.com/479283) builds it's
+ # useful to be able to unwind at runtime.
+ exclude_unwind_tables = (is_chrome_branded && is_official_build) ||
+ (is_chromecast && !is_cast_desktop_build && !is_debug)
+ # Exclude unwind tables for official builds as unwinding can be done from stack
+ # dumps produced by Crashpad at a later time "offline" in the crash server.
+ # For unofficial (e.g. development) builds and non-Chrome branded (e.g. Cronet
+ # which doesn't use Crashpad, crbug.com/479283) builds it's useful to be able
+ # to unwind at runtime.
+ exclude_unwind_tables =
+ (is_chrome_branded && is_official_build) ||
+ (is_chromecast && !is_cast_desktop_build && !is_debug && !is_fuchsia)
}
assert(!is_cfi || use_thin_lto, "CFI requires ThinLTO")
@@ -36,8 +22,9 @@ index ad40fd9..50e19a4 100644
-# For unofficial (e.g. development) builds and non-Chrome branded (e.g. Cronet
-# which doesn't use Crashpad, crbug.com/479283) builds it's useful to be able
-# to unwind at runtime.
-exclude_unwind_tables = (is_chrome_branded && is_official_build) ||
- (is_chromecast && !is_cast_desktop_build && !is_debug)
-exclude_unwind_tables =
- (is_chrome_branded && is_official_build) ||
- (is_chromecast && !is_cast_desktop_build && !is_debug && !is_fuchsia)
-
# If true, optimize for size. Does not affect windows builds.
# Linux & Mac favor speed over size.

35
resources/patches/inox-patchset/chromium-libva-r2.patch
View File

@@ -1,35 +0,0 @@
--- a/content/common/sandbox_linux/bpf_gpu_policy_linux.cc
+++ b/content/common/sandbox_linux/bpf_gpu_policy_linux.cc
@@ -313,11 +313,11 @@ bool GpuProcessPolicy::PreSandboxHook()
dlopen(I965DrvVideoPath, RTLD_NOW | RTLD_GLOBAL | RTLD_NODELETE);
if (I965HybridDrvVideoPath)
dlopen(I965HybridDrvVideoPath, RTLD_NOW | RTLD_GLOBAL | RTLD_NODELETE);
- dlopen("libva.so.1", RTLD_NOW | RTLD_GLOBAL | RTLD_NODELETE);
+ dlopen("libva.so.2", RTLD_NOW | RTLD_GLOBAL | RTLD_NODELETE);
#if defined(USE_OZONE)
- dlopen("libva-drm.so.1", RTLD_NOW | RTLD_GLOBAL | RTLD_NODELETE);
+ dlopen("libva-drm.so.2", RTLD_NOW | RTLD_GLOBAL | RTLD_NODELETE);
#elif defined(USE_X11)
- dlopen("libva-x11.so.1", RTLD_NOW | RTLD_GLOBAL | RTLD_NODELETE);
+ dlopen("libva-x11.so.2", RTLD_NOW | RTLD_GLOBAL | RTLD_NODELETE);
#endif
}
}
--- a/media/gpu/vaapi_wrapper.cc
+++ b/media/gpu/vaapi_wrapper.cc
@@ -1124,12 +1124,12 @@ void VaapiWrapper::PreSandboxInitializat
bool VaapiWrapper::PostSandboxInitialization() {
StubPathMap paths;
- paths[kModuleVa].push_back("libva.so.1");
+ paths[kModuleVa].push_back("libva.so.2");
#if defined(USE_X11)
- paths[kModuleVa_x11].push_back("libva-x11.so.1");
+ paths[kModuleVa_x11].push_back("libva-x11.so.2");
#elif defined(USE_OZONE)
- paths[kModuleVa_drm].push_back("libva-drm.so.1");
+ paths[kModuleVa_drm].push_back("libva-drm.so.2");
#endif
return InitializeStubs(paths);

30
resources/patches/inox-patchset/chromium-memcpy-r0.patch Normal file
View File

@@ -0,0 +1,30 @@
From 4942f56ceb6d60d6f54ebca8e6eba8ba01c278e8 Mon Sep 17 00:00:00 2001
From: Tomas Popela <tomas.popela@gmail.com>
Date: Thu, 7 Dec 2017 22:33:34 +0000
Subject: [PATCH] memcpy used without including string.h
Compiling Chromium with Clang 4.0.1 and using libstdc++ will fail on using
memcpy without including string.h.
Cq-Include-Trybots: master.tryserver.blink:linux_trusty_blink_rel;master.tryserver.chromium.android:android_optional_gpu_tests_rel
Change-Id: Idced1d5de3baf6b520d4a2d61774120642ead1a8
Reviewed-on: https://chromium-review.googlesource.com/813737
Reviewed-by: Thomas Anderson <thomasanderson@chromium.org>
Reviewed-by: vmpstr <vmpstr@chromium.org>
Commit-Queue: Thomas Anderson <thomasanderson@chromium.org>
Cr-Commit-Position: refs/heads/master@{#522579}
---
cc/paint/raw_memory_transfer_cache_entry.cc | 2 ++
1 file changed, 2 insertions(+)
--- a/cc/paint/raw_memory_transfer_cache_entry.cc
+++ b/cc/paint/raw_memory_transfer_cache_entry.cc
@@ -4,6 +4,8 @@
#include "cc/paint/raw_memory_transfer_cache_entry.h"
+#include <string.h>
+
namespace cc {
ClientRawMemoryTransferCacheEntry::ClientRawMemoryTransferCacheEntry(

14
resources/patches/inox-patchset/chromium-omnibox-unescape-fragment.patch
View File

@@ -37,7 +37,7 @@ Date: Sat Dec 16 04:48:11 2017 +0000
+}
--- a/components/url_formatter/elide_url_unittest.cc
+++ b/components/url_formatter/elide_url_unittest.cc
@@ -337,15 +337,16 @@ TEST(TextEliderTest, TestElisionSpecialC
@@ -347,15 +347,16 @@ TEST(TextEliderTest, TestElisionSpecialC
kEllipsisStr + "berkeley.edu:4430/" + kEllipsisStr + "/arbitfilename"},
// Unescaping.
@@ -74,7 +74,7 @@ Date: Sat Dec 16 04:48:11 2017 +0000
--- a/components/url_formatter/url_formatter_unittest.cc
+++ b/components/url_formatter/url_formatter_unittest.cc
@@ -762,7 +762,7 @@ TEST(UrlFormatterTest, FormatUrl) {
@@ -781,7 +781,7 @@ TEST(UrlFormatterTest, FormatUrl) {
{"With a port number and a reference",
"http://www.google.com:8080/#\xE3\x82\xB0", default_format_type,
@@ -83,7 +83,7 @@ Date: Sat Dec 16 04:48:11 2017 +0000
// -------- IDN tests --------
{"Japanese IDN with ja", "http://xn--l8jvb1ey91xtjb.jp",
@@ -1053,7 +1053,7 @@ TEST(UrlFormatterTest, FormatUrlParsed)
@@ -1072,7 +1072,7 @@ TEST(UrlFormatterTest, FormatUrlParsed)
kFormatUrlOmitNothing, net::UnescapeRule::NORMAL, &parsed,
nullptr, nullptr);
EXPECT_EQ(WideToUTF16(L"http://\x30B0:\x30FC@\x30B0\x30FC\x30B0\x30EB.jp:8080"
@@ -92,7 +92,7 @@ Date: Sat Dec 16 04:48:11 2017 +0000
formatted);
EXPECT_EQ(WideToUTF16(L"\x30B0"),
formatted.substr(parsed.username.begin, parsed.username.len));
@@ -1067,7 +1067,7 @@ TEST(UrlFormatterTest, FormatUrlParsed)
@@ -1086,7 +1086,7 @@ TEST(UrlFormatterTest, FormatUrlParsed)
formatted.substr(parsed.path.begin, parsed.path.len));
EXPECT_EQ(WideToUTF16(L"q=\x30B0"),
formatted.substr(parsed.query.begin, parsed.query.len));
@@ -101,7 +101,7 @@ Date: Sat Dec 16 04:48:11 2017 +0000
formatted.substr(parsed.ref.begin, parsed.ref.len));
// Omit_username_password + unescape case.
@@ -1077,7 +1077,7 @@ TEST(UrlFormatterTest, FormatUrlParsed)
@@ -1096,7 +1096,7 @@ TEST(UrlFormatterTest, FormatUrlParsed)
kFormatUrlOmitUsernamePassword, net::UnescapeRule::NORMAL,
&parsed, nullptr, nullptr);
EXPECT_EQ(WideToUTF16(L"http://\x30B0\x30FC\x30B0\x30EB.jp:8080"
@@ -110,7 +110,7 @@ Date: Sat Dec 16 04:48:11 2017 +0000
formatted);
EXPECT_FALSE(parsed.username.is_valid());
EXPECT_FALSE(parsed.password.is_valid());
@@ -1089,7 +1089,7 @@ TEST(UrlFormatterTest, FormatUrlParsed)
@@ -1108,7 +1108,7 @@ TEST(UrlFormatterTest, FormatUrlParsed)
formatted.substr(parsed.path.begin, parsed.path.len));
EXPECT_EQ(WideToUTF16(L"q=\x30B0"),
formatted.substr(parsed.query.begin, parsed.query.len));
@@ -119,7 +119,7 @@ Date: Sat Dec 16 04:48:11 2017 +0000
formatted.substr(parsed.ref.begin, parsed.ref.len));
// View-source case.
@@ -1323,9 +1323,12 @@ TEST(UrlFormatterTest, FormatUrlWithOffs
@@ -1342,9 +1342,12 @@ TEST(UrlFormatterTest, FormatUrlWithOffs
kFormatUrlOmitNothing, net::UnescapeRule::SPACES, unescape_offsets);
const size_t ref_offsets[] = {

2
resources/patches/inox-patchset/chromium-skia-harmony.patch
View File

@@ -61,7 +61,7 @@
SkPaint::Hinting h = rec->getHinting();
if (SkPaint::kFull_Hinting == h && !isLCD(*rec)) {
// collapse full->normal hinting if we're not doing LCD
@@ -1067,11 +1045,11 @@ bool SkScalerContext_FreeType::getCBoxFo
@@ -1062,11 +1040,11 @@ bool SkScalerContext_FreeType::getCBoxFo
void SkScalerContext_FreeType::updateGlyphIfLCD(SkGlyph* glyph) {
if (isLCD(fRec)) {
if (fLCDIsVert) {

178
resources/patches/inox-patchset/chromium-vaapi-r15.patch → resources/patches/inox-patchset/chromium-vaapi-r16.patch
View File

@@ -38,9 +38,9 @@ Signed-off-by: Daniel Charles <daniel.charles@intel.com>
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -1278,12 +1278,14 @@ const FeatureEntry kFeatureEntries[] = {
flag_descriptions::kUiPartialSwapDescription, kOsAll,
SINGLE_DISABLE_VALUE_TYPE(switches::kUIDisablePartialSwap)},
@@ -1281,12 +1281,14 @@ const FeatureEntry kFeatureEntries[] = {
flag_descriptions::kEnablePreventLayerSquashingDescription, kOsAll,
FEATURE_VALUE_TYPE(features::kEnablePreventLayerSquashing)},
#if BUILDFLAG(ENABLE_WEBRTC)
+#if !defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID)
{"disable-webrtc-hw-decoding", flag_descriptions::kWebrtcHwDecodingName,
@@ -53,9 +53,9 @@ Signed-off-by: Daniel Charles <daniel.charles@intel.com>
{"enable-webrtc-hw-h264-encoding",
flag_descriptions::kWebrtcHwH264EncodingName,
flag_descriptions::kWebrtcHwH264EncodingDescription, kOsAndroid | kOsCrOS,
@@ -1589,6 +1591,13 @@ const FeatureEntry kFeatureEntries[] = {
flag_descriptions::kSpuriousPowerButtonLidAngleChangeDescription, kOsCrOS,
MULTI_VALUE_TYPE(kSpuriousPowerButtonLidAngleChangeChoices)},
@@ -1567,6 +1569,13 @@ const FeatureEntry kFeatureEntries[] = {
flag_descriptions::kShowTouchHudDescription, kOsAll,
SINGLE_VALUE_TYPE(ash::switches::kAshTouchHud)},
#endif // OS_CHROMEOS
+#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(OS_ANDROID)
+ {
@@ -67,7 +67,7 @@ Signed-off-by: Daniel Charles <daniel.charles@intel.com>
{
"disable-accelerated-video-decode",
flag_descriptions::kAcceleratedVideoDecodeName,
@@ -1596,6 +1605,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -1574,6 +1583,7 @@ const FeatureEntry kFeatureEntries[] = {
kOsMac | kOsWin | kOsCrOS | kOsAndroid,
SINGLE_DISABLE_VALUE_TYPE(switches::kDisableAcceleratedVideoDecode),
},
@@ -75,9 +75,9 @@ Signed-off-by: Daniel Charles <daniel.charles@intel.com>
{"mojo-video-encode-accelerator",
flag_descriptions::kMojoVideoEncodeAcceleratorName,
flag_descriptions::kMojoVideoEncodeAcceleratorDescription,
@@ -2257,12 +2267,17 @@ const FeatureEntry kFeatureEntries[] = {
FEATURE_VALUE_TYPE(features::kWebVrVsyncAlign)},
#endif // OS_ANDROID
@@ -2302,12 +2312,17 @@ const FeatureEntry kFeatureEntries[] = {
FEATURE_VALUE_TYPE(features::kOpenVR)},
#endif // ENABLE_OPENVR
#endif // ENABLE_VR
-#if defined(OS_CHROMEOS)
+#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(OS_ANDROID)
@@ -105,7 +105,7 @@ Signed-off-by: Daniel Charles <daniel.charles@intel.com>
#include "cc/base/switches.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/chromeos/boot_times_recorder.h"
@@ -79,8 +80,13 @@ void DeriveCommandLine(const GURL& start
@@ -84,8 +85,13 @@ void DeriveCommandLine(const GURL& start
::switches::kDisable2dCanvasImageChromium,
::switches::kDisableAccelerated2dCanvas,
::switches::kDisableAcceleratedJpegDecoding,
@@ -130,7 +130,7 @@ Signed-off-by: Daniel Charles <daniel.charles@intel.com>
#endif
--- a/chrome/browser/flag_descriptions.cc
+++ b/chrome/browser/flag_descriptions.cc
@@ -14,6 +14,13 @@ const char kAccelerated2dCanvasDescripti
@@ -19,6 +19,13 @@ const char kAccelerated2dCanvasDescripti
"Enables the use of the GPU to perform 2d canvas rendering instead of "
"using software rendering.";
@@ -144,7 +144,7 @@ Signed-off-by: Daniel Charles <daniel.charles@intel.com>
const char kAcceleratedVideoDecodeName[] = "Hardware-accelerated video decode";
const char kAcceleratedVideoDecodeDescription[] =
"Hardware-accelerated video decode where available.";
@@ -1485,6 +1492,7 @@ const char kWebrtcEchoCanceller3Name[] =
@@ -1578,6 +1585,7 @@ const char kWebrtcEchoCanceller3Name[] =
const char kWebrtcEchoCanceller3Description[] =
"Experimental WebRTC echo canceller (AEC3).";
@@ -152,7 +152,7 @@ Signed-off-by: Daniel Charles <daniel.charles@intel.com>
const char kWebrtcHwDecodingName[] = "WebRTC hardware video decoding";
const char kWebrtcHwDecodingDescription[] =
"Support in WebRTC for decoding video streams using platform hardware.";
@@ -1492,6 +1500,7 @@ const char kWebrtcHwDecodingDescription[
@@ -1585,6 +1593,7 @@ const char kWebrtcHwDecodingDescription[
const char kWebrtcHwEncodingName[] = "WebRTC hardware video encoding";
const char kWebrtcHwEncodingDescription[] =
"Support in WebRTC for encoding video streams using platform hardware.";
@@ -160,7 +160,7 @@ Signed-off-by: Daniel Charles <daniel.charles@intel.com>
const char kWebrtcHwH264EncodingName[] = "WebRTC hardware h264 video encoding";
const char kWebrtcHwH264EncodingDescription[] =
@@ -2296,14 +2305,16 @@ const char kPermissionPromptPersistenceT
@@ -2396,14 +2405,16 @@ const char kTranslateNewUxDescription[]
// Chrome OS -------------------------------------------------------------------
@@ -191,7 +191,7 @@ Signed-off-by: Daniel Charles <daniel.charles@intel.com>
extern const char kAcceleratedVideoDecodeName[];
extern const char kAcceleratedVideoDecodeDescription[];
@@ -1407,13 +1411,17 @@ extern const char kPermissionPromptPersi
@@ -1483,13 +1487,17 @@ extern const char kPermissionPromptPersi
#endif // defined(OS_MACOSX)
@@ -214,7 +214,7 @@ Signed-off-by: Daniel Charles <daniel.charles@intel.com>
--- a/content/browser/gpu/compositor_util.cc
+++ b/content/browser/gpu/compositor_util.cc
@@ -105,7 +105,11 @@ const GpuFeatureInfo GetGpuFeatureInfo(s
@@ -103,7 +103,11 @@ const GpuFeatureInfo GetGpuFeatureInfo(s
{"video_decode",
manager->IsFeatureBlacklisted(
gpu::GPU_FEATURE_TYPE_ACCELERATED_VIDEO_DECODE),
@@ -226,21 +226,9 @@ Signed-off-by: Daniel Charles <daniel.charles@intel.com>
"Accelerated video decode has been disabled, either via blacklist,"
" about:flags or the command line.",
true},
@@ -113,7 +117,11 @@ const GpuFeatureInfo GetGpuFeatureInfo(s
{"video_encode",
manager->IsFeatureBlacklisted(
gpu::GPU_FEATURE_TYPE_ACCELERATED_VIDEO_ENCODE),
+#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(OS_ANDROID)
+ !command_line.HasSwitch(switches::kEnableAcceleratedVideo),
+#else
command_line.HasSwitch(switches::kDisableWebRtcHWEncoding),
+#endif
"Accelerated video encode has been disabled, either via blacklist,"
" about:flags or the command line.",
true},
--- a/content/browser/gpu/gpu_data_manager_impl_private.cc
+++ b/content/browser/gpu/gpu_data_manager_impl_private.cc
@@ -717,7 +717,11 @@ void GpuDataManagerImplPrivate::AppendRe
@@ -709,7 +709,11 @@ void GpuDataManagerImplPrivate::AppendRe
DCHECK(command_line);
if (ShouldDisableAcceleratedVideoDecode(command_line))
@@ -249,24 +237,12 @@ Signed-off-by: Daniel Charles <daniel.charles@intel.com>
+#else
command_line->AppendSwitch(switches::kDisableAcceleratedVideoDecode);
+#endif
}
#if defined(USE_AURA)
if (!CanUseGpuBrowserCompositor())
@@ -748,7 +752,11 @@ void GpuDataManagerImplPrivate::AppendGp
void GpuDataManagerImplPrivate::AppendGpuCommandLine(
@@ -810,7 +814,12 @@ void GpuDataManagerImplPrivate::UpdateRe
prefs->accelerated_2d_canvas_enabled = false;
}
if (ShouldDisableAcceleratedVideoDecode(command_line)) {
+#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(OS_ANDROID)
+ command_line->AppendSwitch(switches::kEnableAcceleratedVideo);
+#else
command_line->AppendSwitch(switches::kDisableAcceleratedVideoDecode);
+#endif
}
#if defined(USE_OZONE)
@@ -826,7 +834,12 @@ void GpuDataManagerImplPrivate::UpdateRe
const base::CommandLine* command_line =
base::CommandLine::ForCurrentProcess();
if (!ShouldDisableAcceleratedVideoDecode(command_line) &&
- !command_line->HasSwitch(switches::kDisableAcceleratedVideoDecode)) {
+#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(OS_ANDROID)
@@ -278,10 +254,10 @@ Signed-off-by: Daniel Charles <daniel.charles@intel.com>
prefs->pepper_accelerated_video_decode_enabled = true;
}
}
@@ -1016,7 +1029,13 @@ bool GpuDataManagerImplPrivate::ShouldDi
// to resolve crbug/442039 has been collected.
const std::string group_name = base::FieldTrialList::FindFullName(
"DisableAcceleratedVideoDecode");
@@ -959,7 +968,13 @@ bool GpuDataManagerImplPrivate::UpdateAc
bool GpuDataManagerImplPrivate::ShouldDisableAcceleratedVideoDecode(
const base::CommandLine* command_line) const {
- if (command_line->HasSwitch(switches::kDisableAcceleratedVideoDecode)) {
+ if (
+#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(OS_ANDROID)
@@ -295,21 +271,20 @@ Signed-off-by: Daniel Charles <daniel.charles@intel.com>
}
--- a/content/browser/gpu/gpu_process_host.cc
+++ b/content/browser/gpu/gpu_process_host.cc
@@ -111,7 +111,11 @@ namespace {
// Command-line switches to propagate to the GPU process.
static const char* const kSwitchNames[] = {
@@ -114,13 +114,18 @@ static const char* const kSwitchNames[]
service_manager::switches::kDisableSeccompFilterSandbox,
service_manager::switches::kGpuSandboxAllowSysVShm,
service_manager::switches::kGpuSandboxFailuresFatal,
+#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(OS_ANDROID)
+ switches::kEnableAcceleratedVideo,
+#else
switches::kDisableAcceleratedVideoDecode,
+ switches::kDisableAcceleratedVideoDecode,
+#endif
switches::kDisableBreakpad,
switches::kDisableGpuRasterization,
switches::kDisableGpuSandbox,
@@ -120,7 +124,7 @@ static const char* const kSwitchNames[]
switches::kDisableGLExtensions,
switches::kDisableLogging,
switches::kDisableSeccompFilterSandbox,
switches::kDisableShaderNameHashing,
-#if BUILDFLAG(ENABLE_WEBRTC)
+#if BUILDFLAG(ENABLE_WEBRTC) && !defined(OS_LINUX)
@@ -318,7 +293,7 @@ Signed-off-by: Daniel Charles <daniel.charles@intel.com>
#if defined(OS_WIN)
--- a/content/browser/renderer_host/media/video_capture_browsertest.cc
+++ b/content/browser/renderer_host/media/video_capture_browsertest.cc
@@ -155,8 +155,13 @@ class VideoCaptureBrowserTest : public C
@@ -164,8 +164,13 @@ class VideoCaptureBrowserTest : public C
base::CommandLine::ForCurrentProcess()->AppendSwitch(
switches::kUseFakeJpegDecodeAccelerator);
} else {
@@ -330,11 +305,11 @@ Signed-off-by: Daniel Charles <daniel.charles@intel.com>
switches::kDisableAcceleratedMjpegDecode);
+#endif
}
if (params_.use_mojo_service) {
base::CommandLine::ForCurrentProcess()->AppendSwitchASCII(
}
--- a/content/browser/renderer_host/media/video_capture_gpu_jpeg_decoder.cc
+++ b/content/browser/renderer_host/media/video_capture_gpu_jpeg_decoder.cc
@@ -56,15 +56,21 @@ void VideoCaptureGpuJpegDecoder::Initial
@@ -64,15 +64,21 @@ void VideoCaptureGpuJpegDecoder::Initial
bool is_platform_supported =
base::CommandLine::ForCurrentProcess()->HasSwitch(
switches::kUseFakeJpegDecodeAccelerator);
@@ -374,7 +349,7 @@ Signed-off-by: Daniel Charles <daniel.charles@intel.com>
switches::kDisableBackgroundTimerThrottling,
switches::kDisableBreakpad,
switches::kDisableBrowserSideNavigation,
@@ -2680,8 +2684,10 @@ void RenderProcessHostImpl::PropagateBro
@@ -2674,8 +2678,10 @@ void RenderProcessHostImpl::PropagateBro
switches::kDisableMojoRenderer,
#endif
#if BUILDFLAG(ENABLE_WEBRTC)
@@ -403,7 +378,7 @@ Signed-off-by: Daniel Charles <daniel.charles@intel.com>
private:
--- a/content/gpu/BUILD.gn
+++ b/content/gpu/BUILD.gn
@@ -45,7 +45,6 @@ target(link_target_type, "gpu_sources")
@@ -48,7 +48,6 @@ target(link_target_type, "gpu_sources")
]
configs += [ "//content:content_implementation" ]
@@ -411,9 +386,9 @@ Signed-off-by: Daniel Charles <daniel.charles@intel.com>
deps = [
"//base",
"//base/third_party/dynamic_annotations",
@@ -114,4 +113,8 @@ target(link_target_type, "gpu_sources")
if (enable_vulkan) {
deps += [ "//gpu/vulkan" ]
@@ -124,4 +123,8 @@ target(link_target_type, "gpu_sources")
if (is_desktop_linux && (!is_chromecast || is_cast_desktop_build)) {
configs += [ "//build/config/linux/dri" ]
}
+
+ if (is_desktop_linux) {
@@ -422,7 +397,7 @@ Signed-off-by: Daniel Charles <daniel.charles@intel.com>
}
--- a/content/gpu/gpu_main.cc
+++ b/content/gpu/gpu_main.cc
@@ -254,7 +254,7 @@ int GpuMain(const MainFunctionParams& pa
@@ -271,7 +271,7 @@ int GpuMain(const MainFunctionParams& pa
// Initializes StatisticsRecorder which tracks UMA histograms.
base::StatisticsRecorder::Initialize();
@@ -431,7 +406,7 @@ Signed-off-by: Daniel Charles <daniel.charles@intel.com>
// Set thread priority before sandbox initialization.
base::PlatformThread::SetCurrentThreadPriority(base::ThreadPriority::DISPLAY);
#endif
@@ -283,7 +283,7 @@ int GpuMain(const MainFunctionParams& pa
@@ -300,7 +300,7 @@ int GpuMain(const MainFunctionParams& pa
GetContentClient()->SetGpuInfo(gpu_init->gpu_info());
base::ThreadPriority io_thread_priority = base::ThreadPriority::NORMAL;
@@ -450,9 +425,9 @@ Signed-off-by: Daniel Charles <daniel.charles@intel.com>
#include "content/browser/gpu/gpu_process_host.h"
#include "content/public/common/content_features.h"
#include "content/public/common/content_switches.h"
@@ -57,12 +58,19 @@ const gpu::GpuPreferences GetGpuPreferen
gpu_preferences.ui_prioritize_in_gpu_process =
command_line->HasSwitch(switches::kUIPrioritizeInGpuProcess);
@@ -55,12 +56,19 @@ const gpu::GpuPreferences GetGpuPreferen
gpu_preferences.in_process_gpu =
command_line->HasSwitch(switches::kInProcessGPU);
gpu_preferences.disable_accelerated_video_decode =
+#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
+ !command_line->HasSwitch(switches::kEnableAcceleratedVideo);
@@ -474,7 +449,7 @@ Signed-off-by: Daniel Charles <daniel.charles@intel.com>
#endif
--- a/content/public/common/content_switches.cc
+++ b/content/public/common/content_switches.cc
@@ -89,12 +89,21 @@ const char kDisable3DAPIs[]
@@ -78,12 +78,21 @@ const char kDisable3DAPIs[]
// Disable gpu-accelerated 2d canvas.
const char kDisableAccelerated2dCanvas[] = "disable-accelerated-2d-canvas";
@@ -497,7 +472,7 @@ Signed-off-by: Daniel Charles <daniel.charles@intel.com>
// Disables hardware acceleration of video decode, where available.
const char kDisableAcceleratedVideoDecode[] =
"disable-accelerated-video-decode";
@@ -932,11 +941,13 @@ const char kZygoteProcess[]
@@ -903,11 +912,13 @@ const char kZygoteProcess[]
// ignores this switch on its stable and beta channels.
const char kDisableWebRtcEncryption[] = "disable-webrtc-encryption";
@@ -513,7 +488,7 @@ Signed-off-by: Daniel Charles <daniel.charles@intel.com>
// See https://tools.ietf.org/html/rfc7714 for further information.
--- a/content/public/common/content_switches.h
+++ b/content/public/common/content_switches.h
@@ -35,7 +35,11 @@ CONTENT_EXPORT extern const char kDisabl
@@ -33,7 +33,11 @@ CONTENT_EXPORT extern const char kDisabl
CONTENT_EXPORT extern const char kDisable3DAPIs[];
CONTENT_EXPORT extern const char kDisableAccelerated2dCanvas[];
CONTENT_EXPORT extern const char kDisableAcceleratedJpegDecoding[];
@@ -525,7 +500,7 @@ Signed-off-by: Daniel Charles <daniel.charles@intel.com>
CONTENT_EXPORT extern const char kDisableAcceleratedVideoDecode[];
CONTENT_EXPORT extern const char kDisableAudioSupportForDesktopShare[];
extern const char kDisableBackingStoreLimit[];
@@ -109,6 +113,9 @@ CONTENT_EXPORT extern const char kDisabl
@@ -107,6 +111,9 @@ CONTENT_EXPORT extern const char kDisabl
CONTENT_EXPORT extern const char kDomAutomationController[];
extern const char kDisable2dCanvasClipAntialiasing[];
CONTENT_EXPORT extern const char kDumpBlinkRuntimeCallStats[];
@@ -535,7 +510,7 @@ Signed-off-by: Daniel Charles <daniel.charles@intel.com>
CONTENT_EXPORT extern const char kEnableAggressiveDOMStorageFlushing[];
CONTENT_EXPORT extern const char kEnableAutomation[];
CONTENT_EXPORT extern const char kEnablePreferCompositingToLCDText[];
@@ -256,8 +263,10 @@ CONTENT_EXPORT extern const char kZygote
@@ -248,8 +255,10 @@ CONTENT_EXPORT extern const char kZygote
#if BUILDFLAG(ENABLE_WEBRTC)
CONTENT_EXPORT extern const char kDisableWebRtcEncryption[];
@@ -548,7 +523,7 @@ Signed-off-by: Daniel Charles <daniel.charles@intel.com>
CONTENT_EXPORT extern const char kEnableWebRtcStunOrigin[];
--- a/content/renderer/media/webrtc/peer_connection_dependency_factory.cc
+++ b/content/renderer/media/webrtc/peer_connection_dependency_factory.cc
@@ -240,10 +240,19 @@ void PeerConnectionDependencyFactory::In
@@ -243,10 +243,19 @@ void PeerConnectionDependencyFactory::In
const base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess();
if (gpu_factories && gpu_factories->IsGpuVideoAcceleratorEnabled()) {
@@ -571,7 +546,7 @@ Signed-off-by: Daniel Charles <daniel.charles@intel.com>
}
--- a/content/renderer/render_thread_impl.cc
+++ b/content/renderer/render_thread_impl.cc
@@ -1456,7 +1456,11 @@ media::GpuVideoAcceleratorFactories* Ren
@@ -1495,7 +1495,11 @@ media::GpuVideoAcceleratorFactories* Ren
scoped_refptr<base::SingleThreadTaskRunner> media_task_runner =
GetMediaThreadTaskRunner();
const bool enable_video_accelerator =
@@ -581,22 +556,11 @@ Signed-off-by: Daniel Charles <daniel.charles@intel.com>
!cmd_line->HasSwitch(switches::kDisableAcceleratedVideoDecode);
+#endif
const bool enable_gpu_memory_buffer_video_frames =
!is_gpu_compositing_disabled_ &&
#if defined(OS_MACOSX) || defined(OS_LINUX)
!cmd_line->HasSwitch(switches::kDisableGpuMemoryBufferVideoFrames) &&
--- a/gpu/command_buffer/service/gpu_preferences.h
+++ b/gpu/command_buffer/service/gpu_preferences.h
@@ -50,7 +50,7 @@ struct GPU_EXPORT GpuPreferences {
// Disables hardware acceleration of video decode, where available.
bool disable_accelerated_video_decode = false;
-#if defined(OS_CHROMEOS)
+#if defined(OS_CHROMEOS) || defined(OS_LINUX)
// Disables VA-API accelerated video encode.
bool disable_vaapi_accelerated_video_encode = false;
#endif
--- a/gpu/config/software_rendering_list.json
+++ b/gpu/config/software_rendering_list.json
@@ -374,17 +374,6 @@
@@ -373,17 +373,6 @@
]
},
{
@@ -614,20 +578,9 @@ Signed-off-by: Daniel Charles <daniel.charles@intel.com>
"id": 50,
"description": "Disable VMware software renderer on older Mesa",
"cr_bugs": [145531, 332596, 571899, 629434],
--- a/media/filters/BUILD.gn
+++ b/media/filters/BUILD.gn
@@ -189,7 +189,7 @@ source_set("filters") {
deps += [ "//media/base/android" ]
}
- if (current_cpu != "arm" && is_chromeos) {
+ if (current_cpu != "arm" && (is_chromeos || is_desktop_linux)) {
sources += [
"h264_bitstream_buffer.cc",
"h264_bitstream_buffer.h",
--- a/media/gpu/BUILD.gn
+++ b/media/gpu/BUILD.gn
@@ -24,6 +24,14 @@ if (is_mac) {
@@ -25,6 +25,14 @@ if (is_mac) {
import("//build/config/mac/mac_sdk.gni")
}
@@ -641,11 +594,12 @@ Signed-off-by: Daniel Charles <daniel.charles@intel.com>
+
if (use_vaapi) {
action("libva_generate_stubs") {
extra_header = "va_stub_header.fragment"
@@ -334,6 +342,9 @@ component("gpu") {
"vaapi_drm_picture.h",
]
extra_header = "vaapi/va_stub_header.fragment"
@@ -356,6 +364,10 @@ component("gpu") {
if (use_ozone) {
deps += [ "//ui/ozone" ]
}
+
+ if (is_desktop_linux) {
+ public_configs = [ ":libva_config" ]
+ }
@@ -662,13 +616,3 @@ Signed-off-by: Daniel Charles <daniel.charles@intel.com>
#if defined(OS_WIN)
capabilities.supported_profiles =
DXVAVideoDecodeAccelerator::GetSupportedProfiles(gpu_preferences,
--- a/media/gpu/vaapi_wrapper.cc
+++ b/media/gpu/vaapi_wrapper.cc
@@ -1117,6 +1117,7 @@ void VaapiWrapper::PreSandboxInitializat
if (drm_file.IsValid())
GetDisplayState()->SetDrmFd(drm_file.GetPlatformFile());
#endif
+ GetProfileInfos(); // dlopen all necessary libraries
}
// static

34
resources/patches/inox-patchset/chromium-webrtc-r0.patch
View File

@@ -1,34 +0,0 @@
From 7f90e2cceda0458cf56026eb6ccffb961a47804b Mon Sep 17 00:00:00 2001
From: Raphael Kubo da Costa <raphael.kubo.da.costa@intel.com>
Date: Fri, 13 Oct 2017 15:49:32 +0200
Subject: [PATCH] IWYU: Include math.h for round(3).
math.h was being implicitly included, which can break the build with
alternative libc implementations.
Bug: None
Change-Id: I969b320b65d0f44abb33d3e1036cfbcb859a4952
Reviewed-on: https://webrtc-review.googlesource.com/9384
Reviewed-by: Tommi <tommi@webrtc.org>
Commit-Queue: Raphael Kubo da Costa (rakuco) <raphael.kubo.da.costa@intel.com>
Cr-Commit-Position: refs/heads/master@{#20292}
---
p2p/base/port.cc | 2 ++
1 file changed, 2 insertions(+)
diff --git a/p2p/base/port.cc b/p2p/base/port.cc
index a1b478d11..81aa0aadb 100644
--- a/third_party/webrtc/p2p/base/port.cc
+++ b/third_party/webrtc/p2p/base/port.cc
@@ -10,6 +10,8 @@
#include "p2p/base/port.h"
+#include <math.h>
+
#include <algorithm>
#include <vector>
--
2.15.0.rc2

2
resources/patches/iridium-browser/Remove-EV-certificates.patch
View File

@@ -39,5 +39,5 @@ Instead, let them appear just like regular ones.
+#endif
+};
#endif // defined(USE_NSS_CERTS) || defined(OS_IOS) || defined(OS_WIN)
#endif // defined(PLATFORM_USES_CHROMIUM_EV_METADATA)

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

@@ -40,7 +40,6 @@ by default.
chromeos/geolocation/simple_geolocation_provider.cc | 2 +-
components/cloud_devices/common/cloud_devices_urls.cc | 8 ++++----
components/crash/content/app/breakpad_linux.cc | 2 +-
components/crash/content/tools/crash_service.cc | 2 +-
components/drive/service/drive_api_service.cc | 8 ++++----
components/feedback/feedback_uploader.cc | 2 +-
components/gcm_driver/gcm_account_tracker.cc | 4 ++--
@@ -59,7 +58,6 @@ by default.
components/variations/variations_url_constants.cc | 2 +-
content/browser/speech/speech_recognition_engine.cc | 2 +-
content/shell/browser/shell_browser_main_parts.cc | 2 +-
extensions/common/update_manifest.cc | 2 +-
google_apis/gaia/gaia_constants.cc | 18 +++++++++---------
google_apis/gaia/google_service_auth_error.cc | 2 +-
google_apis/gcm/engine/gservices_settings.cc | 6 +++---
@@ -108,7 +106,7 @@ by default.
new google_apis::AuthService(oauth2_token_service,
--- a/chrome/browser/chromeos/extensions/file_manager/private_api_misc.cc
+++ b/chrome/browser/chromeos/extensions/file_manager/private_api_misc.cc
@@ -65,7 +65,7 @@ namespace {
@@ -66,7 +66,7 @@ namespace {
using api::file_manager_private::ProfileInfo;
@@ -154,17 +152,17 @@ by default.
const int kDownloadsLowSpaceWarningHelpNumber = 1061547;
--- a/chrome/browser/extensions/api/cryptotoken_private/cryptotoken_private_api.cc
+++ b/chrome/browser/extensions/api/cryptotoken_private/cryptotoken_private_api.cc
@@ -15,8 +15,8 @@ namespace api {
@@ -16,8 +16,8 @@ namespace {
const char kGoogleDotCom[] = "google.com";
const char* kGoogleGstaticAppIds[] = {
- "https://www.gstatic.com/securitykey/origins.json",
- "https://www.gstatic.com/securitykey/a/google.com/origins.json"
+ "trk:273:https://www.gstatic.com/securitykey/origins.json",
+ "trk:274:https://www.gstatic.com/securitykey/a/google.com/origins.json"
};
constexpr const char* kGoogleGstaticAppIds[] = {
- "https://www.gstatic.com/securitykey/origins.json",
- "https://www.gstatic.com/securitykey/a/google.com/origins.json"};
+ "trk:273:https://www.gstatic.com/securitykey/origins.json",
+ "trk:274:https://www.gstatic.com/securitykey/a/google.com/origins.json"};
} // namespace
CryptotokenPrivateCanOriginAssertAppIdFunction::
--- a/chrome/browser/extensions/install_signer.cc
+++ b/chrome/browser/extensions/install_signer.cc
@@ -66,7 +66,7 @@ const int kSignatureFormatVersion = 2;
@@ -178,14 +176,12 @@ by default.
"-----BEGIN PUBLIC KEY-----" \
--- a/chrome/browser/media/media_url_constants.cc
+++ b/chrome/browser/media/media_url_constants.cc
@@ -6,6 +6,6 @@
@@ -4,4 +4,4 @@
namespace chrome {
#include "chrome/browser/media/media_url_constants.h"
-const char kUploadURL[] = "https://clients2.google.com/cr/report";
+const char kUploadURL[] = "trk:108:https://clients2.google.com/cr/report";
} // namespace chrome
--- a/chrome/browser/nacl_host/nacl_infobar_delegate.cc
+++ b/chrome/browser/nacl_host/nacl_infobar_delegate.cc
@@ -56,5 +56,5 @@ base::string16 NaClInfoBarDelegate::GetL
@@ -334,7 +330,7 @@ by default.
// The maximum number of ignored bubble we track in the NumLaterPerReinstall
--- a/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc
+++ b/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc
@@ -68,17 +68,17 @@ namespace {
@@ -66,17 +66,17 @@ namespace {
// The URL for the the Learn More page shown on incognito new tab.
const char kLearnMoreIncognitoUrl[] =
#if defined(OS_CHROMEOS)
@@ -383,7 +379,7 @@ by default.
--- a/chrome/common/url_constants.cc
+++ b/chrome/common/url_constants.cc
@@ -332,7 +332,7 @@ const char kChromeUIVoiceSearchHost[] =
@@ -23,7 +23,7 @@ const char kCupsPrintLearnMoreURL[] =
const char kEULAPathFormat[] = "/usr/share/chromeos-assets/eula/%s/eula.html";
const char kOemEulaURLPath[] = "oem";
const char kOnlineEulaURLPath[] =
@@ -392,7 +388,7 @@ by default.
const char kChromeOSCreditsPath[] =
"/opt/google/chrome/resources/about_os_credits.html";
@@ -401,7 +401,7 @@ const char kExtensionConfigureCommandsSu
@@ -35,7 +35,7 @@ const char kChromeOSAssetPath[] = "/usr/
const char kExtensionInvalidRequestURL[] = "chrome-extension://invalid/";
const char kSyncGoogleDashboardURL[] =
@@ -401,7 +397,7 @@ by default.
const char kGoogleAccountActivityControlsURL[] =
"https://myaccount.google.com/activitycontrols/search";
@@ -608,7 +608,7 @@ const char kCloudPrintLearnMoreURL[] =
@@ -237,7 +237,7 @@ const char kCloudPrintLearnMoreURL[] =
#endif
const char kCloudPrintNoDestinationsLearnMoreURL[] =
@@ -434,7 +430,7 @@ by default.
if (url.is_valid() && url.has_scheme())
--- a/chromeos/geolocation/simple_geolocation_provider.cc
+++ b/chromeos/geolocation/simple_geolocation_provider.cc
@@ -19,7 +19,7 @@ namespace chromeos {
@@ -20,7 +20,7 @@ namespace chromeos {
namespace {
const char kDefaultGeolocationProviderUrl[] =
@@ -481,17 +477,6 @@ by default.
#endif
bool g_is_crash_reporter_enabled = false;
--- a/components/crash/content/tools/crash_service.cc
+++ b/components/crash/content/tools/crash_service.cc
@@ -25,7 +25,7 @@ namespace {
const wchar_t kTestPipeName[] = L"\\\\.\\pipe\\ChromeCrashServices";
-const wchar_t kCrashReportURL[] = L"https://clients2.google.com/cr/report";
+const wchar_t kCrashReportURL[] = L"trk:07:https://clients2.google.com/cr/report";
const wchar_t kCheckPointFile[] = L"crash_checkpoint.txt";
typedef std::map<std::wstring, std::wstring> CrashMap;
--- a/components/drive/service/drive_api_service.cc
+++ b/components/drive/service/drive_api_service.cc
@@ -78,11 +78,11 @@ namespace drive {
@@ -578,13 +563,17 @@ by default.
--- a/components/metrics/url_constants.cc
+++ b/components/metrics/url_constants.cc
@@ -7,9 +7,9 @@
@@ -7,12 +7,12 @@
namespace metrics {
const char kNewMetricsServerUrl[] =
- "https://clientservices.googleapis.com/uma/v2";
+ "trk:265:https://clientservices.googleapis.com/uma/v2";
const char kNewMetricsServerUrlInsecure[] =
- "http://clientservices.googleapis.com/uma/v2";
+ "trk:265:http://clientservices.googleapis.com/uma/v2";
-const char kOldMetricsServerUrl[] = "https://clients4.google.com/uma/v2";
+const char kOldMetricsServerUrl[] = "trk:265:https://clients4.google.com/uma/v2";
@@ -609,7 +598,7 @@ by default.
base::Time out_time;
--- a/components/policy/core/common/policy_loader_win.cc
+++ b/components/policy/core/common/policy_loader_win.cc
@@ -59,7 +59,7 @@ const char kKeyThirdParty[] = "3rdparty"
@@ -60,7 +60,7 @@ const char kKeyThirdParty[] = "3rdparty"
// The web store url that is the only trusted source for extensions.
const char kExpectedWebStoreUrl[] =
@@ -620,16 +609,16 @@ by default.
--- a/components/policy/resources/policy_templates.json
+++ b/components/policy/resources/policy_templates.json
@@ -2393,7 +2393,7 @@
'dynamic_refresh': True,
'per_profile': True,
},
- 'example_value': ['gbchcmhmhahfdphkhkmpfmihenigjmpp;https://clients2.google.com/service/update2/crx'],
+ 'example_value': ['gbchcmhmhahfdphkhkmpfmihenigjmpp;trk:16:https://clients2.google.com/service/update2/crx'],
'id': 34,
'caption': '''Configure the list of force-installed apps and extensions''',
'tags': ['full-admin-access'],
@@ -5618,7 +5618,7 @@
@@ -2692,7 +2692,7 @@
'dynamic_refresh': True,
'per_profile': True,
},
- 'example_value': ['gbchcmhmhahfdphkhkmpfmihenigjmpp;https://clients2.google.com/service/update2/crx'],
+ 'example_value': ['gbchcmhmhahfdphkhkmpfmihenigjmpp;trk:16:https://clients2.google.com/service/update2/crx'],
'id': 34,
'caption': '''Configure the list of force-installed apps and extensions''',
'tags': ['full-admin-access'],
@@ -5906,7 +5906,7 @@
'features': {
'dynamic_refresh': True,
},
@@ -704,7 +693,7 @@ by default.
--- a/content/shell/browser/shell_browser_main_parts.cc
+++ b/content/shell/browser/shell_browser_main_parts.cc
@@ -75,7 +75,7 @@ GURL GetStartupURL() {
@@ -73,7 +73,7 @@ GURL GetStartupURL() {
#endif
if (args.empty())
@@ -713,17 +702,6 @@ by default.
GURL url(args[0]);
if (url.is_valid() && url.has_scheme())
--- a/extensions/common/update_manifest.cc
+++ b/extensions/common/update_manifest.cc
@@ -17,7 +17,7 @@
static const char* kExpectedGupdateProtocol = "2.0";
static const char* kExpectedGupdateXmlns =
- "http://www.google.com/update2/response";
+ "trk:182:http://www.google.com/update2/response";
UpdateManifest::Result::Result() : size(0), diff_size(0) {}
--- a/google_apis/gaia/gaia_constants.cc
+++ b/google_apis/gaia/gaia_constants.cc
@@ -24,31 +24,31 @@ const char kSyncService[] = "chromiumsyn
@@ -859,7 +837,7 @@ by default.
"https://www.googleapis.com/auth/googletalk",
--- a/ui/app_list/demo/app_list_demo_views.cc
+++ b/ui/app_list/demo/app_list_demo_views.cc
@@ -91,7 +91,7 @@ views::View* DemoAppListViewDelegate::Cr
@@ -93,7 +93,7 @@ views::View* DemoAppListViewDelegate::Cr
const gfx::Size& size) {
web_contents_.reset(content::WebContents::Create(
content::WebContents::CreateParams(browser_context_)));
@@ -879,3 +857,14 @@ by default.
webview_->GetWebContents()->Focus();
}
--- a/extensions/browser/updater/safe_manifest_parser.cc
+++ b/extensions/browser/updater/safe_manifest_parser.cc
@@ -26,7 +26,7 @@ namespace {
constexpr char kExpectedGupdateProtocol[] = "2.0";
constexpr char kExpectedGupdateXmlns[] =
- "http://www.google.com/update2/response";
+ "trk:182:http://www.google.com/update2/response";
void ReportError(ParseUpdateManifestCallback callback,
const std::string& error) {

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

@@ -1,90 +0,0 @@
From 0d9f2b1c6e6a97ede4b87c02e3c444b28b6d7464 Mon Sep 17 00:00:00 2001
From: amistry <amistry@chromium.org>
Date: Tue, 9 Jun 2015 12:18:39 -0700
Subject: [PATCH 52/66] hotword: disable at build time by default
Commit f269d3b548203e217e8c0080c2e22e7ae3efb51e upstream:
"""
Hotwording downloads a shared module from the web store containing a
NaCl module. There is a desire to build and distribute Chromium
without this happening. This change adds an "enable_hotwording" build
flag that is enabled by default, but can be disabled at compile time.
BUG=491435
Review URL: https://codereview.chromium.org/1160243004
Cr-Commit-Position: refs/heads/master@{#333548}
"""
Hard-disable hotwording by default even on a build level.
---
chrome/browser/BUILD.gn | 2 +-
chrome/browser/extensions/component_loader.cc | 4 ++--
chrome/browser/search/hotword_service_unittest.cc | 4 ++++
3 files changed, 7 insertions(+), 3 deletions(-)
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -3467,7 +3467,7 @@ split_static_library("browser") {
]
}
- if (enable_hotwording) {
+ if (false) {
defines += [ "ENABLE_HOTWORDING" ]
}
--- a/chrome/browser/extensions/component_loader.cc
+++ b/chrome/browser/extensions/component_loader.cc
@@ -356,7 +356,7 @@ void ComponentLoader::AddHangoutServices
}
void ComponentLoader::AddHotwordAudioVerificationApp() {
-#if defined(ENABLE_HOTWORDING)
+#if 0
if (HotwordServiceFactory::IsAlwaysOnAvailable()) {
Add(IDR_HOTWORD_AUDIO_VERIFICATION_MANIFEST,
base::FilePath(FILE_PATH_LITERAL("hotword_audio_verification")));
@@ -365,7 +365,7 @@ void ComponentLoader::AddHotwordAudioVer
}
void ComponentLoader::AddHotwordHelperExtension() {
-#if defined(ENABLE_HOTWORDING)
+#if 0
if (HotwordServiceFactory::IsHotwordAllowed(profile_)) {
Add(IDR_HOTWORD_MANIFEST,
base::FilePath(FILE_PATH_LITERAL("hotword")));
--- a/chrome/browser/search/hotword_service_unittest.cc
+++ b/chrome/browser/search/hotword_service_unittest.cc
@@ -166,6 +166,7 @@ INSTANTIATE_TEST_CASE_P(HotwordServiceTe
// Disabled due to http://crbug.com/503963.
TEST_P(HotwordServiceTest, DISABLED_IsHotwordAllowedLocale) {
+#if defined(ENABLE_HOTWORDING)
TestingProfile::Builder profile_builder;
std::unique_ptr<TestingProfile> profile = profile_builder.Build();
@@ -207,6 +208,7 @@ TEST_P(HotwordServiceTest, DISABLED_IsHo
Profile* otr_profile = profile->GetOffTheRecordProfile();
SetApplicationLocale(otr_profile, "en");
EXPECT_FALSE(HotwordServiceFactory::IsHotwordAllowed(otr_profile));
+#endif // defined(ENABLE_HOTWORDING)
}
TEST_P(HotwordServiceTest, ShouldReinstallExtension) {
@@ -263,6 +265,7 @@ TEST_P(HotwordServiceTest, PreviousLangu
}
TEST_P(HotwordServiceTest, UninstallReinstallTriggeredCorrectly) {
+#if defined(ENABLE_HOTWORDING)
InitializeEmptyExtensionService();
service_->Init();
@@ -343,6 +346,7 @@ TEST_P(HotwordServiceTest, UninstallRein
#endif
EXPECT_FALSE(hotword_service->MaybeReinstallHotwordExtension());
EXPECT_EQ(1, hotword_service->uninstall_count()); // no change
+#endif // defined(ENABLE_HOTWORDING)
}
TEST_P(HotwordServiceTest, DisableAlwaysOnOnLanguageChange) {

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

@@ -58,7 +58,7 @@ stripped and processing continues with the inner URL.
--- a/chrome/BUILD.gn
+++ b/chrome/BUILD.gn
@@ -243,6 +243,7 @@ if (!is_android && !is_mac) {
@@ -246,6 +246,7 @@ if (!is_android && !is_mac) {
deps += [
# On Linux, link the dependencies (libraries) that make up actual
# Chromium functionality directly into the executable.
@@ -66,7 +66,7 @@ stripped and processing continues with the inner URL.
":browser_dependencies",
":child_dependencies",
@@ -485,6 +486,7 @@ if (is_win) {
@@ -492,6 +493,7 @@ if (is_win) {
"//content/public/app:child",
"//content/public/common:service_names",
"//headless:headless_shell_child_lib",
@@ -76,18 +76,18 @@ stripped and processing continues with the inner URL.
--- a/chrome/app/chrome_main.cc
+++ b/chrome/app/chrome_main.cc
@@ -15,6 +15,10 @@
#include "content/public/common/content_switches.h"
#include "headless/public/headless_shell.h"
@@ -17,6 +17,10 @@
#include "ui/base/ui_base_switches.h"
#include "ui/base/ui_features.h"
#include "ui/gfx/switches.h"
+#if !defined(CHROME_MULTIPLE_DLL_CHILD)
+# include "net/url_request/url_request.h"
+# include "iridium/trknotify.h"
+#endif
#if BUILDFLAG(ENABLE_PACKAGE_MASH_SERVICES)
#if BUILDFLAG(ENABLE_MUS)
#include "services/service_manager/runner/common/client_util.h"
@@ -47,6 +51,19 @@ int ChromeMain(int argc, const char** ar
@@ -49,6 +53,19 @@ int ChromeMain(int argc, const char** ar
}
#endif
@@ -107,9 +107,9 @@ stripped and processing continues with the inner URL.
#if defined(OS_WIN)
DLLEXPORT int __cdecl ChromeMain(HINSTANCE instance,
sandbox::SandboxInterfaceInfo* sandbox_info,
@@ -120,6 +137,9 @@ int ChromeMain(int argc, const char** ar
@@ -127,6 +144,9 @@ int ChromeMain(int argc, const char** ar
}
#endif // BUILDFLAG(ENABLE_PACKAGE_MASH_SERVICES)
#endif // BUILDFLAG(ENABLE_MUS)
+#if !defined(CHROME_MULTIPLE_DLL_CHILD)
+ net::trace_urlreq_cb = &trace_url_request;
@@ -139,7 +139,7 @@ stripped and processing continues with the inner URL.
url.SchemeIs(dom_distiller::kDomDistillerScheme))
--- a/chrome/browser/ui/browser_navigator.cc
+++ b/chrome/browser/ui/browser_navigator.cc
@@ -636,6 +636,14 @@ bool IsURLAllowedInIncognito(const GURL&
@@ -658,6 +658,14 @@ bool IsURLAllowedInIncognito(const GURL&
return stripped_url.is_valid() &&
IsURLAllowedInIncognito(stripped_url, browser_context);
}
@@ -168,17 +168,17 @@ stripped and processing continues with the inner URL.
GURL rewritten_tab_url = tab_url;
--- a/components/infobars/core/infobar_delegate.h
+++ b/components/infobars/core/infobar_delegate.h
@@ -146,6 +146,7 @@ class InfoBarDelegate {
VR_FEEDBACK_INFOBAR_ANDROID = 76,
@@ -147,6 +147,7 @@ class InfoBarDelegate {
FRAMEBUST_BLOCK_INFOBAR_ANDROID = 77,
SURVEY_INFOBAR_ANDROID = 78,
NEAR_OOM_INFOBAR_ANDROID = 79,
+ TRACKING_ALERT_INFOBAR_DELEGATE = 9001,
};
// Describes navigation events, used to decide whether infobars should be
--- a/components/omnibox/browser/autocomplete_input.cc
+++ b/components/omnibox/browser/autocomplete_input.cc
@@ -472,7 +472,8 @@ void AutocompleteInput::ParseForEmphasiz
@@ -474,7 +474,8 @@ void AutocompleteInput::ParseForEmphasiz
int after_scheme_and_colon = parts.scheme.end() + 1;
// For the view-source scheme, we should emphasize the scheme and host of the
// URL qualified by the view-source prefix.
@@ -188,7 +188,7 @@ stripped and processing continues with the inner URL.
(static_cast<int>(text.length()) > after_scheme_and_colon)) {
// Obtain the URL prefixed by view-source and parse it.
base::string16 real_url(text.substr(after_scheme_and_colon));
@@ -539,9 +540,10 @@ int AutocompleteInput::NumNonHostCompone
@@ -543,9 +544,10 @@ int AutocompleteInput::NumNonHostCompone
bool AutocompleteInput::HasHTTPScheme(const base::string16& input) {
std::string utf8_input(base::UTF16ToUTF8(input));
url::Component scheme;
@@ -198,14 +198,14 @@ stripped and processing continues with the inner URL.
+ else if (url::FindAndCompareScheme(utf8_input, kViewSourceScheme, &scheme))
utf8_input.erase(0, scheme.end() + 1);
- }
return url::FindAndCompareScheme(utf8_input, url::kHttpScheme, NULL);
return url::FindAndCompareScheme(utf8_input, url::kHttpScheme, nullptr);
}
--- a/content/browser/browser_url_handler_impl.cc
+++ b/content/browser/browser_url_handler_impl.cc
@@ -13,9 +13,28 @@
#include "content/public/browser/content_browser_client.h"
@@ -14,9 +14,28 @@
#include "content/public/common/url_constants.h"
#include "content/public/common/url_utils.h"
#include "url/gurl.h"
+#include "net/url_request/url_request.h"
@@ -232,7 +232,7 @@ stripped and processing continues with the inner URL.
// Handles rewriting view-source URLs for what we'll actually load.
static bool HandleViewSource(GURL* url, BrowserContext* browser_context) {
if (url->SchemeIs(kViewSourceScheme)) {
@@ -99,6 +118,7 @@ BrowserURLHandlerImpl::BrowserURLHandler
@@ -100,6 +119,7 @@ BrowserURLHandlerImpl::BrowserURLHandler
AddHandlerPair(&HandleViewSource, &ReverseViewSource);
GetContentClient()->browser()->BrowserURLHandlerCreated(this);
@@ -433,7 +433,7 @@ stripped and processing continues with the inner URL.
+#endif /* IRIDIUM_TRKNOTIFY_H */
--- a/net/url_request/url_request.cc
+++ b/net/url_request/url_request.cc
@@ -47,6 +47,8 @@ using std::string;
@@ -52,6 +52,8 @@ using std::string;
namespace net {
@@ -441,8 +441,8 @@ stripped and processing continues with the inner URL.
+
namespace {
// Max number of http redirects to follow. Same number as gecko.
@@ -580,6 +582,10 @@ URLRequest::URLRequest(const GURL& url,
// TODO(battre): Delete this, see http://crbug.com/89321:
@@ -578,6 +580,10 @@ URLRequest::URLRequest(const GURL& url,
// Sanity check out environment.
DCHECK(base::ThreadTaskRunnerHandle::IsSet());
@@ -455,7 +455,7 @@ stripped and processing continues with the inner URL.
NetLogEventType::REQUEST_ALIVE,
--- a/net/url_request/url_request.h
+++ b/net/url_request/url_request.h
@@ -894,6 +894,8 @@ class NET_EXPORT URLRequest : public bas
@@ -901,6 +901,8 @@ class NET_EXPORT URLRequest : public bas
DISALLOW_COPY_AND_ASSIGN(URLRequest);
};
@@ -466,17 +466,17 @@ stripped and processing continues with the inner URL.
#endif // NET_URL_REQUEST_URL_REQUEST_H_
--- a/tools/metrics/histograms/enums.xml
+++ b/tools/metrics/histograms/enums.xml
@@ -20883,6 +20883,7 @@ uploading your change for review. These
<int value="76" label="VR_FEEDBACK_INFOBAR_ANDROID"/>
@@ -21873,6 +21873,7 @@ Called by update_gpu_driver_bug_workarou
<int value="77" label="FRAMEBUST_BLOCK_INFOBAR_ANDROID"/>
<int value="78" label="SURVEY_INFOBAR_ANDROID"/>
<int value="79" label="NEAR_OOM_INFOBAR_ANDROID"/>
+ <int value="9001" label="TRACKING_ALERT_INFOBAR_DELEGATE"/>
</enum>
<enum name="InfoBarResponse">
--- a/url/gurl.cc
+++ b/url/gurl.cc
@@ -540,6 +540,41 @@ size_t GURL::EstimateMemoryUsage() const
@@ -470,6 +470,41 @@ size_t GURL::EstimateMemoryUsage() const
(parsed_.inner_parsed() ? sizeof(url::Parsed) : 0);
}

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

@@ -22,7 +22,7 @@ References: https://github.com/iridium-browser/iridium-browser/issues/33
--- a/chrome/browser/signin/signin_promo.cc
+++ b/chrome/browser/signin/signin_promo.cc
@@ -84,6 +84,7 @@ namespace signin {
@@ -130,6 +130,7 @@ namespace signin {
bool ShouldShowPromoAtStartup(Profile* profile, bool is_new_profile) {
DCHECK(profile);

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

@@ -27,7 +27,7 @@ the URL so we get notified if this happens again in the future).
net::DefineNetworkTrafficAnnotation("safe_browsing_incident", R"(
--- a/chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.cc
+++ b/chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.cc
@@ -310,11 +310,14 @@ IncidentReportingService::UploadContext:
@@ -309,11 +309,14 @@ IncidentReportingService::UploadContext:
// static
bool IncidentReportingService::IsEnabledForProfile(Profile* profile) {
@@ -56,7 +56,7 @@ the URL so we get notified if this happens again in the future).
--- a/chrome/browser/safe_browsing/safe_browsing_service.cc
+++ b/chrome/browser/safe_browsing/safe_browsing_service.cc
@@ -317,7 +317,7 @@ SafeBrowsingDatabaseManager* SafeBrowsin
@@ -316,7 +316,7 @@ SafeBrowsingDatabaseManager* SafeBrowsin
}
void SafeBrowsingService::RegisterAllDelayedAnalysis() {
@@ -67,16 +67,11 @@ the URL so we get notified if this happens again in the future).
}
--- a/components/security_interstitials/core/safe_browsing_loud_error_ui.cc
+++ b/components/security_interstitials/core/safe_browsing_loud_error_ui.cc
@@ -23,10 +23,12 @@ namespace {
@@ -22,6 +22,7 @@ namespace {
// For malware interstitial pages, we link the problematic URL to Google's
// diagnostic page.
#if defined(GOOGLE_CHROME_BUILD)
+// trk:227
const char kSbDiagnosticUrl[] =
"https://www.google.com/safebrowsing/"
"diagnostic?site=%s&client=googlechrome";
#else
+// trk:228
const char kSbDiagnosticUrl[] =
"https://www.google.com/safebrowsing/diagnostic?site=%s&client=chromium";
#endif
"https://transparencyreport.google.com/safe-browsing/search?url=%s";

2
resources/patches/iridium-browser/updater-disable-auto-update.patch
View File

@@ -16,7 +16,7 @@ the case anyway, since we are based off Chromium, not Chrome.
--- a/chrome/browser/app_controller_mac.mm
+++ b/chrome/browser/app_controller_mac.mm
@@ -677,7 +677,7 @@ static base::mac::ScopedObjCClassSwizzle
@@ -691,7 +691,7 @@ static base::mac::ScopedObjCClassSwizzle
CFStringRef checkInterval = CFSTR("checkInterval");
CFPropertyListRef plist = CFPreferencesCopyAppValue(checkInterval, app);
if (!plist) {

4
resources/patches/opensuse/gcc60-fixes.patch
View File

@@ -2,7 +2,7 @@ Description: Fixes builds with GCC version 6
--- a/build/config/compiler/BUILD.gn
+++ b/build/config/compiler/BUILD.gn
@@ -474,6 +474,7 @@ config("compiler") {
@@ -465,6 +465,7 @@ config("compiler") {
# TODO(thakis): Eventually switch this to c++11 instead,
# http://crbug.com/427584
cflags_c += [ "-std=gnu11" ]
@@ -12,7 +12,7 @@ Description: Fixes builds with GCC version 6
cflags_cc += [ "-std=gnu++11" ]
--- a/chrome/browser/safe_browsing/BUILD.gn
+++ b/chrome/browser/safe_browsing/BUILD.gn
@@ -51,6 +51,8 @@ static_library("safe_browsing") {
@@ -54,6 +54,8 @@ static_library("safe_browsing") {
"//chrome/app:generated_resources",
"//components/chrome_cleaner/public/interfaces",
"//components/safe_browsing/common:interfaces",

2
resources/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
@@ -1238,6 +1238,10 @@ const FeatureEntry kFeatureEntries[] = {
@@ -1234,6 +1234,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")},

4
resources/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
@@ -170,6 +170,16 @@ const unsigned kOsDesktop = kOsMac | kOs
@@ -179,6 +179,16 @@ const unsigned kOsDesktop = kOsMac | kOs
const unsigned kOsAura = kOsWin | kOsLinux | kOsCrOS;
#endif // USE_AURA
@@ -20,7 +20,7 @@
const FeatureEntry::Choice kTouchEventFeatureDetectionChoices[] = {
{flags_ui::kGenericExperimentChoiceAutomatic, "", ""},
{flags_ui::kGenericExperimentChoiceEnabled,
@@ -1220,6 +1230,10 @@ const FeatureEntry kFeatureEntries[] = {
@@ -1216,6 +1226,10 @@ const FeatureEntry kFeatureEntries[] = {
flag_descriptions::kDisableTrkbarDescription, kOsDesktop,
SINGLE_VALUE_TYPE("disable-trkbar")},
#endif

28
resources/patches/ungoogled-chromium/add-flag-to-disable-trkbar.patch
View File

@@ -1,8 +1,8 @@
--- a/chrome/app/chrome_main.cc
+++ b/chrome/app/chrome_main.cc
@@ -15,11 +15,6 @@
#include "content/public/common/content_switches.h"
#include "headless/public/headless_shell.h"
@@ -17,11 +17,6 @@
#include "ui/base/ui_base_switches.h"
#include "ui/base/ui_features.h"
#include "ui/gfx/switches.h"
-#if !defined(CHROME_MULTIPLE_DLL_CHILD)
-# include "net/url_request/url_request.h"
@@ -10,9 +10,9 @@
-# include "base/strings/string_util.h"
-#endif
#if BUILDFLAG(ENABLE_PACKAGE_MASH_SERVICES)
#if BUILDFLAG(ENABLE_MUS)
#include "services/service_manager/runner/common/client_util.h"
@@ -52,20 +47,6 @@ int ChromeMain(int argc, const char** ar
@@ -54,20 +49,6 @@ int ChromeMain(int argc, const char** ar
}
#endif
@@ -33,9 +33,9 @@
#if defined(OS_WIN)
DLLEXPORT int __cdecl ChromeMain(HINSTANCE instance,
sandbox::SandboxInterfaceInfo* sandbox_info,
@@ -139,9 +120,6 @@ int ChromeMain(int argc, const char** ar
@@ -146,9 +127,6 @@ int ChromeMain(int argc, const char** ar
}
#endif // BUILDFLAG(ENABLE_PACKAGE_MASH_SERVICES)
#endif // BUILDFLAG(ENABLE_MUS)
-#if !defined(CHROME_MULTIPLE_DLL_CHILD)
- net::trace_urlreq_cb = &trace_url_request;
@@ -45,7 +45,7 @@
return rv;
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -1215,6 +1215,11 @@ const FeatureEntry::FeatureVariation kSp
@@ -1211,6 +1211,11 @@ const FeatureEntry::FeatureVariation kSp
//
// When adding a new choice, add it to the end of the list.
const FeatureEntry kFeatureEntries[] = {
@@ -59,8 +59,8 @@
"Record histograms and user actions.",
--- a/chrome/browser/chrome_browser_main.cc
+++ b/chrome/browser/chrome_browser_main.cc
@@ -291,8 +291,27 @@
#include "chrome/browser/metrics/desktop_session_duration/desktop_session_duration_tracker.h"
@@ -293,8 +293,27 @@
#include "ui/aura/env.h"
#endif
+#if !defined(CHROME_MULTIPLE_DLL_CHILD)
@@ -86,8 +86,8 @@
+
namespace {
// A provider of Geolocation services to override AccessTokenStore.
@@ -985,6 +1004,13 @@ int ChromeBrowserMainParts::PreCreateThr
// This function provides some ways to test crash and assertion handling
@@ -981,6 +1000,13 @@ int ChromeBrowserMainParts::PreCreateThr
about_flags::ConvertFlagsToSwitches(&flags_storage,
base::CommandLine::ForCurrentProcess(),
flags_ui::kAddSentinels);
@@ -103,7 +103,7 @@
// The MaterialDesignController needs to look at command line flags, which
--- a/chrome/browser/flag_descriptions.cc
+++ b/chrome/browser/flag_descriptions.cc
@@ -690,6 +690,12 @@ const char kIconNtpName[] = "Large icons
@@ -751,6 +751,12 @@ const char kIconNtpName[] = "Large icons
const char kIconNtpDescription[] =
"Enable the experimental New Tab page using large icons.";
@@ -118,7 +118,7 @@
"Overrides the built-in software rendering list and enables "
--- a/chrome/browser/flag_descriptions.h
+++ b/chrome/browser/flag_descriptions.h
@@ -439,6 +439,9 @@ extern const char kHtmlBasedUsernameDete
@@ -475,6 +475,9 @@ extern const char kHtmlBasedUsernameDete
extern const char kIconNtpName[];
extern const char kIconNtpDescription[];

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

@@ -2,16 +2,16 @@
--- a/chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc
+++ b/chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc
@@ -5,6 +5,7 @@
#include "chrome/browser/ui/views/tabs/browser_tab_strip_controller.h"
@@ -7,6 +7,7 @@
#include <utility>
#include "base/auto_reset.h"
+#include "base/command_line.h"
#include "base/macros.h"
#include "base/metrics/user_metrics.h"
#include "base/task_scheduler/post_task.h"
@@ -79,13 +80,13 @@ TabRendererData::NetworkState TabContent
}
@@ -66,13 +67,13 @@ using content::WebContents;
namespace {
bool DetermineTabStripLayoutStacked(PrefService* prefs, bool* adjust_layout) {
- *adjust_layout = false;
@@ -29,7 +29,7 @@
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -1220,6 +1220,10 @@ const FeatureEntry kFeatureEntries[] = {
@@ -1216,6 +1216,10 @@ const FeatureEntry kFeatureEntries[] = {
flag_descriptions::kDisableTrkbarDescription, kOsDesktop,
SINGLE_VALUE_TYPE("disable-trkbar")},
#endif

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

@@ -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).
@@ -2308,7 +2304,7 @@ bool HostResolverImpl::IsIPv6Reachable(c
@@ -2352,7 +2348,7 @@ bool HostResolverImpl::IsIPv6Reachable(c
if ((base::TimeTicks::Now() - last_ipv6_probe_time_).InMilliseconds() >
kIPv6ProbePeriodMs) {
last_ipv6_probe_result_ =

22
resources/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
@@ -143,6 +143,7 @@
@@ -149,6 +149,7 @@
#define IDC_DEV_TOOLS_INSPECT 40023
#define IDC_UPGRADE_DIALOG 40024
#define IDC_VIEW_INCOMPATIBILITIES 40025
@@ -12,7 +12,7 @@
#define IDC_BOOKMARKS_MENU 40029
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -1037,6 +1037,9 @@ are declared in build/common.gypi.
@@ -1064,6 +1064,9 @@ are declared in build/common.gypi.
<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 @@
<message name="IDS_SHOW_DOWNLOADS" desc="The show downloads menu in the app menu">
&amp;Downloads
</message>
@@ -1075,6 +1078,9 @@ are declared in build/common.gypi.
@@ -1102,6 +1105,9 @@ are declared in build/common.gypi.
<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>
@@ -34,7 +34,7 @@
</message>
--- a/chrome/browser/ui/toolbar/app_menu_model.cc
+++ b/chrome/browser/ui/toolbar/app_menu_model.cc
@@ -194,6 +194,7 @@ void ToolsMenuModel::Build(Browser* brow
@@ -195,6 +195,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);
@@ -449,6 +450,13 @@ void AppMenuModel::LogMenuMetrics(int co
@@ -452,6 +453,13 @@ void AppMenuModel::LogMenuMetrics(int co
}
LogMenuAction(MENU_ACTION_CLEAR_BROWSING_DATA);
break;
@@ -78,7 +78,7 @@
--- a/chrome/browser/ui/browser_command_controller.cc
+++ b/chrome/browser/ui/browser_command_controller.cc
@@ -57,6 +57,9 @@
@@ -59,6 +59,9 @@
#include "printing/features/features.h"
#include "services/service_manager/public/cpp/connector.h"
#include "ui/events/keycodes/keyboard_codes.h"
@@ -88,7 +88,7 @@
#if defined(OS_MACOSX)
#include "chrome/browser/ui/browser_commands_mac.h"
@@ -589,6 +592,9 @@ void BrowserCommandController::ExecuteCo
@@ -640,6 +643,9 @@ bool BrowserCommandController::ExecuteCo
case IDC_CLEAR_BROWSING_DATA:
ShowClearBrowsingDataDialog(browser_);
break;
@@ -98,7 +98,7 @@
case IDC_IMPORT_SETTINGS:
ShowImportDialog(browser_);
break;
@@ -797,6 +803,7 @@ void BrowserCommandController::InitComma
@@ -891,6 +897,7 @@ void BrowserCommandController::InitComma
!profile()->IsOffTheRecord());
command_updater_.UpdateCommandEnabled(IDC_CLEAR_BROWSING_DATA,
!guest_session);
@@ -108,7 +108,7 @@
command_updater_.UpdateCommandEnabled(IDC_TOUCH_HUD_PROJECTION_TOGGLE, true);
--- a/tools/metrics/histograms/histograms.xml
+++ b/tools/metrics/histograms/histograms.xml
@@ -106046,6 +106046,7 @@ http://cs/file:chrome/histograms.xml - b
@@ -109733,6 +109733,7 @@ http://cs/file:chrome/histograms.xml - b
</suffix>
<suffix name="Cast"/>
<suffix name="BetaForum"/>
@@ -118,7 +118,7 @@
--- a/net/http/http_auth_cache.cc
+++ b/net/http/http_auth_cache.cc
@@ -253,6 +253,10 @@ bool HttpAuthCache::Remove(const GURL& o
@@ -250,6 +250,10 @@ bool HttpAuthCache::Remove(const GURL& o
return false;
}
@@ -142,7 +142,7 @@
--- a/tools/metrics/histograms/enums.xml
+++ b/tools/metrics/histograms/enums.xml
@@ -42286,6 +42286,7 @@ Called by update_traffic_annotation_hist
@@ -44909,6 +44909,7 @@ Called by update_traffic_annotation_hist
<int value="43" label="Exit"/>
<int value="44" label="Upgrade browser"/>
<int value="45" label="Cast"/>

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

@@ -51,7 +51,7 @@
--- a/content/common/BUILD.gn
+++ b/content/common/BUILD.gn
@@ -275,11 +275,6 @@ source_set("common") {
@@ -258,11 +258,6 @@ source_set("common") {
"presentation/presentation_struct_traits.cc",
"presentation/presentation_struct_traits.h",
"process_type.cc",
@@ -60,9 +60,9 @@
- "quarantine/quarantine_linux.cc",
- "quarantine/quarantine_mac.mm",
- "quarantine/quarantine_win.cc",
"quota_messages.h",
"render_process_messages.h",
"render_widget_surface_properties.cc",
"render_widget_surface_properties.h",
"resize_params.cc",
--- a/content/common/quarantine/quarantine.cc
+++ b/content/common/quarantine/quarantine.cc
@@ -6,8 +6,6 @@
@@ -82,7 +82,7 @@
-#endif // !WIN && !MAC && !LINUX
--- a/content/public/common/BUILD.gn
+++ b/content/public/common/BUILD.gn
@@ -194,7 +194,6 @@ source_set("common_sources") {
@@ -195,7 +195,6 @@ source_set("common_sources") {
"process_type.h",
"push_event_payload.h",
"push_subscription_options.h",
@@ -92,15 +92,15 @@
"renderer_preferences.cc",
--- a/content/browser/download/base_file.cc
+++ b/content/browser/download/base_file.cc
@@ -19,7 +19,6 @@
#include "content/browser/download/download_net_log_parameters.h"
@@ -21,7 +21,6 @@
#include "content/browser/download/download_stats.h"
#include "content/public/browser/content_browser_client.h"
#include "content/public/browser/download_item.h"
-#include "content/public/common/quarantine.h"
#include "crypto/secure_hash.h"
#include "net/base/net_errors.h"
#include "net/log/net_log.h"
@@ -390,7 +389,7 @@ DownloadInterruptReason BaseFile::LogInt
@@ -437,7 +436,7 @@ DownloadInterruptReason BaseFile::LogInt
return reason;
}
@@ -109,7 +109,7 @@
namespace {
@@ -473,7 +472,7 @@ DownloadInterruptReason BaseFile::Annota
@@ -521,7 +520,7 @@ DownloadInterruptReason BaseFile::Annota
}
return DOWNLOAD_INTERRUPT_REASON_FILE_FAILED;
}

2
resources/patches/ungoogled-chromium/disable-fonts-googleapis-references.patch
View File

@@ -2,7 +2,7 @@
--- a/components/dom_distiller/content/browser/dom_distiller_viewer_source.cc
+++ b/components/dom_distiller/content/browser/dom_distiller_viewer_source.cc
@@ -309,7 +309,7 @@ bool DomDistillerViewerSource::ShouldSer
@@ -310,7 +310,7 @@ bool DomDistillerViewerSource::ShouldSer
std::string DomDistillerViewerSource::GetContentSecurityPolicyStyleSrc()
const {

14
resources/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
@@ -221,35 +221,6 @@ void GaiaAuthFetcher::CreateAndStartGaia
@@ -219,35 +219,6 @@ void GaiaAuthFetcher::CreateAndStartGaia
int load_flags,
const net::NetworkTrafficAnnotationTag& traffic_annotation) {
DCHECK(!fetch_pending_) << "Tried to fetch two things at once!";
@@ -41,7 +41,7 @@
// static
--- a/chrome/browser/resources/component_extension_resources.grd
+++ b/chrome/browser/resources/component_extension_resources.grd
@@ -41,8 +41,6 @@
@@ -40,8 +40,6 @@
<include name="IDR_BOOKMARK_MANAGER_BOOKMARK_BMM_JS" file="bookmark_manager/js/bmm.js" type="BINDATA" />
<!-- Material Design Bookmarks -->
<include name="IDR_COMPONENT_MD_BOOKMARKS_BOOKMARKS_HTML" file="md_bookmarks/bookmarks.html" type="BINDATA" />
@@ -83,7 +83,7 @@
#endif
--- a/chrome/browser/ui/webui/signin/inline_login_ui.cc
+++ b/chrome/browser/ui/webui/signin/inline_login_ui.cc
@@ -44,7 +44,6 @@ content::WebUIDataSource* CreateWebUIDat
@@ -43,7 +43,6 @@ content::WebUIDataSource* CreateWebUIDat
source->AddResourcePath("inline_login.css", IDR_INLINE_LOGIN_CSS);
source->AddResourcePath("inline_login.js", IDR_INLINE_LOGIN_JS);
@@ -93,7 +93,7 @@
source->AddLocalizedString(
--- a/chrome/browser/browser_resources.grd
+++ b/chrome/browser/browser_resources.grd
@@ -302,7 +302,6 @@
@@ -306,7 +306,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" />
@@ -101,11 +101,11 @@
<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" />
@@ -437,7 +436,6 @@
@@ -441,7 +440,6 @@
</if>
<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" />
- <include name="IDR_GAIA_AUTH_MANIFEST" file="resources\gaia_auth\manifest.json" type="BINDATA" />
<if expr="chromeos">
<include name="IDR_CROSH_BUILTIN_MANIFEST" file="resources\chromeos\crosh_builtin\manifest.json" type="BINDATA" />
<include name="IDR_CRYPTOHOME_HTML" file="resources\chromeos\cryptohome.html" flattenhtml="true" type="BINDATA" />
<include name="IDR_BLUETOOTH_PAIRING_DIALOG_HTML" file="resources\chromeos\bluetooth_pairing_dialog.html" flattenhtml="true" allowexternalscript="true" type="chrome_html" />
<include name="IDR_BLUETOOTH_PAIRING_DIALOG_JS" file="resources\chromeos\bluetooth_pairing_dialog.js" type="chrome_html" />

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

@@ -2,7 +2,7 @@
--- a/net/base/url_util.cc
+++ b/net/base/url_util.cc
@@ -394,28 +394,6 @@ void GetIdentityFromURL(const GURL& url,
@@ -393,28 +393,6 @@ void GetIdentityFromURL(const GURL& url,
}
bool HasGoogleHost(const GURL& url) {
@@ -156,7 +156,7 @@
--- a/components/google/core/browser/google_util.cc
+++ b/components/google/core/browser/google_util.cc
@@ -41,118 +41,16 @@
@@ -41,118 +41,16 @@ namespace {
bool gUseMockLinkDoctorBaseURLForTesting = false;
@@ -276,7 +276,7 @@
}
void SetMockLinkDoctorBaseURLForTesting() {
@@ -166,119 +64,50 @@
@@ -166,119 +64,50 @@ std::string GetGoogleLocale(const std::s
GURL AppendGoogleLocaleParam(const GURL& url,
const std::string& application_locale) {

2
resources/patches/ungoogled-chromium/disable-logging-urls-to-stderr.patch
View File

@@ -53,7 +53,7 @@
}; /* namespace iridium */
--- a/chrome/app/chrome_main.cc
+++ b/chrome/app/chrome_main.cc
@@ -54,7 +54,6 @@ int ChromeMain(int argc, const char** ar
@@ -56,7 +56,6 @@ int ChromeMain(int argc, const char** ar
#if !defined(CHROME_MULTIPLE_DLL_CHILD)
static void trace_url_request(const std::string &caller, const GURL &url)
{

6
resources/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
@@ -159,7 +159,7 @@ void SigninManagerBase::Initialize(PrefS
@@ -162,7 +162,7 @@ void SigninManagerBase::Initialize(PrefS
bool SigninManagerBase::IsInitialized() const { return initialized_; }
bool SigninManagerBase::IsSigninAllowed() const {
@@ -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
@@ -361,6 +355,7 @@ void ShowSearchEngineSettings(Browser* b
@@ -384,6 +378,7 @@ void ShowSearchEngineSettings(Browser* b
#if !defined(OS_ANDROID)
void ShowBrowserSignin(Browser* browser,
signin_metrics::AccessPoint access_point) {
@@ -34,7 +34,7 @@
Profile* original_profile = browser->profile()->GetOriginalProfile();
SigninManagerBase* manager =
SigninManagerFactory::GetForProfile(original_profile);
@@ -400,6 +395,7 @@ void ShowBrowserSignin(Browser* browser,
@@ -424,6 +419,7 @@ void ShowBrowserSignin(Browser* browser,
false));
DCHECK_GT(browser->tab_strip_model()->count(), 0);
}

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

@@ -2,14 +2,14 @@
--- a/components/translate/core/browser/translate_manager.cc
+++ b/components/translate/core/browser/translate_manager.cc
@@ -158,7 +158,7 @@ void TranslateManager::InitiateTranslati
@@ -102,7 +102,7 @@ void TranslateManager::InitiateTranslati
if (net::NetworkChangeNotifier::IsOffline())
return;
- if (!ignore_missing_key_for_testing_ && !::google_apis::HasKeysConfigured()) {
+ if (true) {
// Without an API key, translate won't work, so don't offer to translate
// in the first place. Leave prefs::kEnableTranslate on, though, because
// Without an API key, translate won't work, so don't offer to translate in
// the first place. Leave prefs::kOfferTranslateEnabled on, though, because
// that settings syncs and we don't want to turn off translate everywhere
--- a/components/translate/content/renderer/translate_helper.cc
+++ b/components/translate/content/renderer/translate_helper.cc

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

@@ -2,17 +2,17 @@
--- a/chrome/browser/plugins/plugins_resource_service.cc
+++ b/chrome/browser/plugins/plugins_resource_service.cc
@@ -50,9 +50,6 @@ const int kStartResourceFetchDelayMs = 6
@@ -51,9 +51,6 @@ const int kStartResourceFetchDelayMs = 6
// Delay between calls to update the cache 1 day and 2 minutes in testing mode.
const int kCacheUpdateDelayMs = 24 * 60 * 60 * 1000;
-const char kPluginsServerUrl[] =
- "https://www.gstatic.com/chrome/config/plugins_2/";
- "https://www.gstatic.com/chrome/config/plugins_3/";
-
GURL GetPluginsServerURL() {
std::string filename;
#if defined(OS_WIN)
@@ -67,7 +64,7 @@ GURL GetPluginsServerURL() {
@@ -68,7 +65,7 @@ GURL GetPluginsServerURL() {
#error Unknown platform
#endif
@@ -23,7 +23,7 @@
} // namespace
--- a/chrome/browser/safe_browsing/client_side_model_loader.cc
+++ b/chrome/browser/safe_browsing/client_side_model_loader.cc
@@ -35,8 +35,6 @@ namespace safe_browsing {
@@ -34,8 +34,6 @@ namespace safe_browsing {
// Model Loader strings
const size_t ModelLoader::kMaxModelSizeBytes = 150 * 1024;
const int ModelLoader::kClientModelFetchIntervalMs = 3600 * 1000;
@@ -32,7 +32,7 @@
const char ModelLoader::kClientModelNamePattern[] =
"client_model_v5%s_variation_%d.pb";
const char ModelLoader::kClientModelFinchExperiment[] =
@@ -89,7 +87,7 @@ ModelLoader::ModelLoader(base::Closure u
@@ -88,7 +86,7 @@ ModelLoader::ModelLoader(base::Closure u
net::URLRequestContextGetter* request_context_getter,
bool is_extended_reporting)
: name_(FillInModelName(is_extended_reporting, GetModelNumber())),
@@ -41,7 +41,7 @@
update_renderers_callback_(update_renderers_callback),
request_context_getter_(request_context_getter),
weak_factory_(this) {
@@ -100,7 +98,7 @@ ModelLoader::ModelLoader(base::Closure u
@@ -99,7 +97,7 @@ ModelLoader::ModelLoader(base::Closure u
ModelLoader::ModelLoader(base::Closure update_renderers_callback,
const std::string& model_name)
: name_(model_name),
@@ -82,7 +82,7 @@
--- a/rlz/lib/financial_ping.cc
+++ b/rlz/lib/financial_ping.cc
@@ -365,7 +365,7 @@ bool FinancialPing::PingServer(const cha
@@ -366,7 +366,7 @@ bool FinancialPing::PingServer(const cha
// Open network connection.
InternetHandle connection_handle = InternetConnectA(inet_handle,
@@ -91,7 +91,7 @@
INTERNET_FLAG_NO_CACHE_WRITE, 0);
if (!connection_handle)
return false;
@@ -407,7 +407,7 @@ bool FinancialPing::PingServer(const cha
@@ -408,7 +408,7 @@ bool FinancialPing::PingServer(const cha
return true;
#else
std::string url = base::StringPrintf("http://%s:%d%s",

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

@@ -14,7 +14,7 @@
if (base::PathExists(upload_done_data.log_path)) {
WebRtcLogUtil::DeleteOldWebRtcLogFiles(upload_done_data.log_path);
-
- local_log_id = base::DoubleToString(base::Time::Now().ToDoubleT());
- local_log_id = base::NumberToString(base::Time::Now().ToDoubleT());
- base::FilePath log_file_path =
- upload_done_data.log_path.AppendASCII(local_log_id)
- .AddExtension(FILE_PATH_LITERAL(".gz"));

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

@@ -33,7 +33,7 @@
extensions::ExtensionsClient* client = extensions::ExtensionsClient::Get();
--- a/extensions/browser/updater/extension_downloader.cc
+++ b/extensions/browser/updater/extension_downloader.cc
@@ -89,27 +89,18 @@ const char kNotFromWebstoreInstallSource
@@ -88,27 +88,18 @@ const char kNotFromWebstoreInstallSource
const char kDefaultInstallSource[] = "";
const char kReinstallInstallSource[] = "reinstall";
@@ -63,7 +63,7 @@
bool ShouldRetryRequest(const net::URLRequestStatus& status,
int response_code) {
@@ -287,17 +278,6 @@ void ExtensionDownloader::StartBlacklist
@@ -288,17 +279,6 @@ void ExtensionDownloader::StartBlacklist
const std::string& version,
const ManifestFetchData::PingData& ping_data,
int request_id) {
@@ -81,7 +81,7 @@
}
void ExtensionDownloader::SetWebstoreIdentityProvider(
@@ -327,23 +307,16 @@ bool ExtensionDownloader::AddExtensionDa
@@ -328,23 +308,16 @@ bool ExtensionDownloader::AddExtensionDa
return false;
}
@@ -107,7 +107,7 @@
} else {
url_stats_.other_url_count++;
}
@@ -655,23 +628,6 @@ void ExtensionDownloader::HandleManifest
@@ -656,23 +629,6 @@ void ExtensionDownloader::HandleManifest
FetchUpdatedExtension(std::move(fetch));
}
@@ -131,7 +131,7 @@
NotifyExtensionsDownloadFailed(
not_updated, fetch_data->request_ids(),
ExtensionDownloaderDelegate::NO_UPDATE_AVAILABLE);
@@ -981,11 +937,7 @@ bool ExtensionDownloader::IterateFetchCr
@@ -982,11 +938,7 @@ bool ExtensionDownloader::IterateFetchCr
// fetch.
switch (fetch->credentials) {
case ExtensionFetch::CREDENTIALS_NONE:

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

@@ -17,7 +17,7 @@
// PlzNavigate
--- a/chrome/browser/ui/browser_commands.cc
+++ b/chrome/browser/ui/browser_commands.cc
@@ -348,12 +348,6 @@ int GetContentRestrictions(const Browser
@@ -347,12 +347,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;
}
@@ -892,8 +886,7 @@ bool CanSavePage(const Browser* browser)
@@ -891,8 +885,7 @@ bool CanSavePage(const Browser* browser)
prefs::kAllowFileSelectionDialogs)) {
return false;
}
@@ -42,7 +42,7 @@
void ShowFindBar(Browser* browser) {
--- a/components/offline_pages/core/offline_page_model.cc
+++ b/components/offline_pages/core/offline_page_model.cc
@@ -29,7 +29,7 @@ OfflinePageModel::DeletedPageInfo::Delet
@@ -33,7 +33,7 @@ OfflinePageModel::DeletedPageInfo::Delet
// static
bool OfflinePageModel::CanSaveURL(const GURL& url) {

8
resources/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
@@ -425,6 +425,7 @@ void OneClickSigninSyncStarter::CancelSi
@@ -420,6 +420,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_);
@@ -439,6 +440,7 @@ void OneClickSigninSyncStarter::ConfirmA
@@ -434,6 +435,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
@@ -2199,10 +2199,6 @@ split_static_library("ui") {
@@ -2253,10 +2253,6 @@ split_static_library("ui") {
"cocoa/omnibox/omnibox_view_mac.mm",
"cocoa/omnibox_decoration_bubble_controller.h",
"cocoa/omnibox_decoration_bubble_controller.mm",
@@ -47,7 +47,7 @@
"cocoa/page_info/page_info_bubble_controller.h",
"cocoa/page_info/page_info_bubble_controller.mm",
"cocoa/page_info/page_info_utils_cocoa.h",
@@ -3062,8 +3058,6 @@ split_static_library("ui") {
@@ -3141,8 +3137,6 @@ split_static_library("ui") {
"views/profiles/signin_view_controller_delegate_views.cc",
"views/profiles/signin_view_controller_delegate_views.h",
"views/screen_capture_notification_ui_views.cc",

16
resources/patches/ungoogled-chromium/fix-building-without-reporting.patch
View File

@@ -14,7 +14,7 @@
#include "chrome/browser/ui/webui/print_preview/privet_printer_handler.h"
--- a/content/browser/net/reporting_service_proxy.cc
+++ b/content/browser/net/reporting_service_proxy.cc
@@ -60,6 +60,7 @@ class ReportingServiceProxyImpl : public
@@ -97,6 +97,7 @@ class ReportingServiceProxyImpl : public
const std::string& group,
const std::string& type,
std::unique_ptr<base::Value> body) {
@@ -22,7 +22,7 @@
net::URLRequestContext* request_context =
request_context_getter_->GetURLRequestContext();
if (!request_context) {
@@ -75,6 +76,7 @@ class ReportingServiceProxyImpl : public
@@ -112,6 +113,7 @@ class ReportingServiceProxyImpl : public
}
reporting_service->QueueReport(url, group, type, std::move(body));
@@ -32,7 +32,7 @@
scoped_refptr<net::URLRequestContextGetter> request_context_getter_;
--- a/chrome/browser/profiles/profile_impl_io_data.h
+++ b/chrome/browser/profiles/profile_impl_io_data.h
@@ -194,6 +194,7 @@ class ProfileImplIOData : public Profile
@@ -182,6 +182,7 @@ class ProfileImplIOData : public Profile
const StoragePartitionDescriptor& partition_descriptor) const override;
chrome_browser_net::Predictor* GetPredictor() override;
@@ -40,7 +40,7 @@
// Returns a net::ReportingService, if reporting should be enabled. Otherwise,
// returns nullptr.
// TODO(mmenke): Remove once URLRequestContextBuilders are always used to
@@ -204,6 +205,7 @@ class ProfileImplIOData : public Profile
@@ -192,6 +193,7 @@ class ProfileImplIOData : public Profile
// Returns a net::ReportingPolicy, if reporting should be enabled. Otherwise,
// returns nullptr.
static std::unique_ptr<net::ReportingPolicy> MaybeCreateReportingPolicy();
@@ -50,7 +50,7 @@
mutable std::unique_ptr<LazyParams> lazy_params_;
--- a/chrome/browser/profiles/profile_impl_io_data.cc
+++ b/chrome/browser/profiles/profile_impl_io_data.cc
@@ -481,7 +481,9 @@
@@ -472,7 +472,9 @@ void ProfileImplIOData::InitializeIntern
builder, std::move(request_interceptors),
std::move(profile_params->protocol_handler_interceptor));
@@ -60,7 +60,7 @@
}
void ProfileImplIOData::OnMainRequestContextCreated(
@@ -617,7 +619,9 @@
@@ -608,7 +610,9 @@ net::URLRequestContext* ProfileImplIODat
context->host_resolver()));
context->SetJobFactory(std::move(top_job_factory));
@@ -70,7 +70,7 @@
return context;
}
@@ -707,6 +711,7 @@
@@ -698,6 +702,7 @@ chrome_browser_net::Predictor* ProfileIm
return predictor_.get();
}
@@ -78,7 +78,7 @@
std::unique_ptr<net::ReportingService>
ProfileImplIOData::MaybeCreateReportingService(
net::URLRequestContext* url_request_context) const {
@@ -725,3 +730,4 @@
@@ -716,3 +721,4 @@ ProfileImplIOData::MaybeCreateReportingP
return base::MakeUnique<net::ReportingPolicy>();
}

10
resources/patches/ungoogled-chromium/intercept-all-modified-domains.patch
View File

@@ -2,15 +2,15 @@
--- a/chrome/app/chrome_main.cc
+++ b/chrome/app/chrome_main.cc
@@ -18,6 +18,7 @@
@@ -20,6 +20,7 @@
#if !defined(CHROME_MULTIPLE_DLL_CHILD)
# include "net/url_request/url_request.h"
# include "iridium/trknotify.h"
+# include "base/strings/string_util.h"
#endif
#if BUILDFLAG(ENABLE_PACKAGE_MASH_SERVICES)
@@ -54,11 +55,13 @@ int ChromeMain(int argc, const char** ar
#if BUILDFLAG(ENABLE_MUS)
@@ -56,11 +57,13 @@ int ChromeMain(int argc, const char** ar
#if !defined(CHROME_MULTIPLE_DLL_CHILD)
static void trace_url_request(const std::string &caller, const GURL &url)
{
@@ -31,7 +31,7 @@
#endif
--- a/content/browser/browser_url_handler_impl.cc
+++ b/content/browser/browser_url_handler_impl.cc
@@ -19,8 +19,10 @@ namespace content {
@@ -20,8 +20,10 @@ namespace content {
static bool handle_trace_scheme(GURL *url, BrowserContext *)
{
@@ -46,7 +46,7 @@
*url = url->strip_trk();
--- a/url/gurl.cc
+++ b/url/gurl.cc
@@ -554,7 +554,7 @@ bool gurl_is_trq(const std::string &s)
@@ -484,7 +484,7 @@ bool gurl_is_trq(const std::string &s)
GURL GURL::strip_trk(void) const
{

4
resources/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
@@ -309,7 +309,7 @@ WindowOpenDisposition RenderViewImpl::Na
@@ -308,7 +308,7 @@ WindowOpenDisposition RenderViewImpl::Na
case blink::kWebNavigationPolicyNewWindow:
return WindowOpenDisposition::NEW_WINDOW;
case blink::kWebNavigationPolicyNewPopup:
@@ -13,7 +13,7 @@
return WindowOpenDisposition::IGNORE_ACTION;
--- a/chrome/browser/ui/views/frame/browser_view.cc
+++ b/chrome/browser/ui/views/frame/browser_view.cc
@@ -1420,7 +1420,7 @@ void BrowserView::CutCopyPaste(int comma
@@ -1442,7 +1442,7 @@ void BrowserView::CutCopyPaste(int comma
WindowOpenDisposition BrowserView::GetDispositionForPopupBounds(
const gfx::Rect& bounds) {

4
resources/patches/ungoogled-chromium/prevent-trace-url-requests.patch
View File

@@ -2,7 +2,7 @@
--- a/url/gurl.cc
+++ b/url/gurl.cc
@@ -542,15 +542,7 @@ size_t GURL::EstimateMemoryUsage() const
@@ -472,15 +472,7 @@ size_t GURL::EstimateMemoryUsage() const
std::string &gurl_strip_trk(std::string &s)
{
@@ -21,7 +21,7 @@
bool gurl_is_trq(const std::string &s)
--- a/chrome/browser/ui/browser_navigator.cc
+++ b/chrome/browser/ui/browser_navigator.cc
@@ -638,10 +638,7 @@ bool IsURLAllowedInIncognito(const GURL&
@@ -660,10 +660,7 @@ bool IsURLAllowedInIncognito(const GURL&
}
if (url.SchemeIs(url::kTraceScheme)) {

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

@@ -4,10 +4,10 @@
+++ b/chrome/browser/ui/startup/bad_flags_prompt.cc
@@ -89,7 +89,7 @@ void ShowBadFlagsPrompt(Browser* browser
// These flags disable sandbox-related security.
switches::kDisableGpuSandbox,
switches::kDisableSeccompFilterSandbox,
- switches::kDisableSetuidSandbox,
+ //switches::kDisableSetuidSandbox,
switches::kDisableWebSecurity,
#if BUILDFLAG(ENABLE_NACL)
switches::kNaClDangerousNoSandboxNonSfi,
service_manager::switches::kDisableGpuSandbox,
service_manager::switches::kDisableSeccompFilterSandbox,
- service_manager::switches::kDisableSetuidSandbox,
+ //service_manager::switches::kDisableSetuidSandbox,
#if defined(OS_WIN)
service_manager::switches::kAllowThirdPartyModules,
#endif

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

@@ -5,7 +5,7 @@
--- a/third_party/WebKit/Source/devtools/BUILD.gn
+++ b/third_party/WebKit/Source/devtools/BUILD.gn
@@ -987,12 +987,6 @@ generated_non_autostart_non_remote_modul
@@ -981,12 +981,6 @@ generated_non_autostart_non_remote_modul
"$resources_out_dir/timeline_model/timeline_model_module.js",
"$resources_out_dir/timeline/timeline_module.js",
"$resources_out_dir/workspace_diff/workspace_diff_module.js",
@@ -18,7 +18,7 @@
"$resources_out_dir/accessibility/accessibility_module.js",
"$resources_out_dir/audits2_worker/audits2_worker_module.js",
"$resources_out_dir/cm_modes/cm_modes_module.js",
@@ -1002,6 +996,12 @@ generated_remote_modules = [
@@ -995,6 +989,12 @@ generated_remote_modules = [
"$resources_out_dir/screencast/screencast_module.js",
]
@@ -46,7 +46,7 @@
{ "name": "audits2", "condition": "!v8only" },
{ "name": "devices" },
{ "name": "security", "condition": "!v8only" },
@@ -33,19 +33,19 @@
@@ -33,18 +33,18 @@
{ "name": "source_frame" },
{ "name": "text_editor" },
{ "name": "cm" },
@@ -58,9 +58,8 @@
{ "name": "snippets" },
{ "name": "diff" },
- { "name": "terminal", "type": "remote" },
+ { "name": "terminal" },
{ "name": "sass", "condition": "!v8only" },
- { "name": "accessibility", "condition": "!v8only", "type": "remote" },
+ { "name": "terminal" },
+ { "name": "accessibility", "condition": "!v8only" },
{ "name": "animation", "condition": "!v8only" },
{ "name": "coverage" },

2
resources/version.ini
View File

@@ -1,3 +1,3 @@
[main]
chromium_version = 63.0.3239.132
chromium_version = 64.0.3282.119
release_revision = 1