Consolidate some patches, updates
This commit is contained in:
csagan5
parent
f7b74aa489
commit
43dbb5e70b
5 changed files with 72 additions and 48 deletions
|
|
@ -54,7 +54,6 @@ Add-bookmark-import-export-actions.patch
|
|||
Add-an-always-incognito-mode.patch
|
||||
Add-option-to-not-persist-tabs-across-sessions.patch
|
||||
Disable-fetching-of-all-field-trials.patch
|
||||
Disable-seed-based-field-trials.patch
|
||||
Disable-plugins-enumeration.patch
|
||||
net-cert-increase-default-key-length-for-newly-generated-RSA-keys.patch
|
||||
dns-send-IPv6-connectivity-probes-to-RIPE-DNS.patch
|
||||
|
|
@ -164,4 +163,5 @@ Enable-native-Android-autofill.patch
|
|||
Keep-empty-tabs-between-sessions.patch
|
||||
Disable-third-party-origin-trials.patch
|
||||
Never-use-HTTP-probes-for-connection-detection.patch
|
||||
Disable-Accessibility-service-by-default.patch
|
||||
Automated-domain-substitution.patch
|
||||
|
|
|
|||
|
|
@ -8328,7 +8328,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro
|
|||
</message>
|
||||
<message name="IDS_ANDROID_HISTORY_BLOCKED_SITE" desc="The text displayed in the history page indicating that a visit to a web site was blocked due to an administrator policy.">
|
||||
Blocked site
|
||||
@@ -1511,7 +1511,7 @@ Your Google account may have other forms of browsing history like searches and a
|
||||
@@ -1517,7 +1517,7 @@ Your Google account may have other forms of browsing history like searches and a
|
||||
In Lite mode, Chrome loads pages faster and uses up to 60 percent less data. To optimize the pages that you visit, Chrome sends your web traffic to Google. <ph name="BEGIN_LINK"><link></ph>Learn more<ph name="END_LINK"></link></ph>
|
||||
</message>
|
||||
<message name="IDS_DATA_REDUCTION_PROMO_LEARN_MORE_URL" desc="URL for Lite mode help center article" translateable="false">
|
||||
|
|
@ -8337,7 +8337,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro
|
|||
</message>
|
||||
<message name="IDS_DATA_REDUCTION_ENABLE_BUTTON_LITE_MODE" desc="Button the user presses if they want to enable Lite mode" >
|
||||
Turn on Lite mode
|
||||
@@ -1729,10 +1729,10 @@ Your Google account may have other forms of browsing history like searches and a
|
||||
@@ -1735,10 +1735,10 @@ Your Google account may have other forms of browsing history like searches and a
|
||||
Waiting for details of parents.
|
||||
</message>
|
||||
<message name="IDS_ACCOUNT_MANAGEMENT_ONE_PARENT_NAME" desc="String for name of single parent for child account.">
|
||||
|
|
@ -8350,7 +8350,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro
|
|||
</message>
|
||||
<message name="IDS_ACCOUNT_MANAGEMENT_CHILD_CONTENT_TITLE" desc="Title of the Content setting, which controls which websites a child is allowed to visit.">
|
||||
Content
|
||||
@@ -1791,22 +1791,22 @@ Your Google account may have other forms of browsing history like searches and a
|
||||
@@ -1797,22 +1797,22 @@ Your Google account may have other forms of browsing history like searches and a
|
||||
Google Terms of Service
|
||||
</message>
|
||||
<message name="IDS_GOOGLE_TERMS_OF_SERVICE_URL" desc="URL for Google terms of service" translateable="false">
|
||||
|
|
@ -8377,7 +8377,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro
|
|||
</message>
|
||||
|
||||
<!-- Sign-in strings -->
|
||||
@@ -1823,7 +1823,7 @@ Your Google account may have other forms of browsing history like searches and a
|
||||
@@ -1829,7 +1829,7 @@ Your Google account may have other forms of browsing history like searches and a
|
||||
Also clear your Chrome data from this device
|
||||
</message>
|
||||
<message name="IDS_SIGNOUT_MANAGED_ACCOUNT_MESSAGE" desc="Message to display for sign out of Chrome dialog when the account has enterprise management, and all user data will be erased">
|
||||
|
|
@ -8386,7 +8386,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro
|
|||
</message>
|
||||
<message name="IDS_SIGN_IN_GETTING_ACCOUNT_MANAGEMENT_POLICY" desc="Title of progress bar dialog for getting management policy">
|
||||
Contacting Google. This may take a minute…
|
||||
@@ -1928,7 +1928,7 @@ Your Google account may have other forms of browsing history like searches and a
|
||||
@@ -1934,7 +1934,7 @@ Your Google account may have other forms of browsing history like searches and a
|
||||
Your data was encrypted with your <ph name="BEGIN_LINK"><learnmore></ph>sync passphrase<ph name="END_LINK"></learnmore></ph> on <ph name="TIME">%1$s<ex>Sept 1, 2012</ex></ph>. Enter it to start sync.
|
||||
</message>
|
||||
<message name="IDS_SYNC_ACCOUNT_INFO" desc="The message that appears in the options dialog indicating that the user is signed in with the given email address.">
|
||||
|
|
@ -8395,7 +8395,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro
|
|||
</message>
|
||||
<message name="IDS_SYNC_PASSPHRASE_CANNOT_BE_BLANK" desc="Inform user that they cannot use a blank password [CHAR_LIMIT=40]">
|
||||
This field cannot be blank
|
||||
@@ -3982,7 +3982,7 @@ To change this setting, <ph name="BEGIN_LINK"><resetlink></ph>reset sync<p
|
||||
@@ -3988,7 +3988,7 @@ To change this setting, <ph name="BEGIN_LINK"><resetlink></ph>reset sync<p
|
||||
|
||||
<!-- WebUsb Picker UI strings -->
|
||||
<message name="IDS_USB_CHOOSER_DIALOG_PROMPT" desc="The text that is used to introduce the USB chooser dialog to the user.">
|
||||
|
|
@ -8404,7 +8404,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro
|
|||
</message>
|
||||
<message name="IDS_USB_CHOOSER_DIALOG_NO_DEVICES_FOUND_PROMPT" desc="The label shown to the user to inform them that no USB devices were found matching the requirements that the application provided.">
|
||||
No compatible devices found
|
||||
@@ -4016,7 +4016,7 @@ To change this setting, <ph name="BEGIN_LINK"><resetlink></ph>reset sync<p
|
||||
@@ -4022,7 +4022,7 @@ To change this setting, <ph name="BEGIN_LINK"><resetlink></ph>reset sync<p
|
||||
Running in Chrome
|
||||
</message>
|
||||
<message name="IDS_TWA_RUNNING_IN_CHROME_V2" desc="Updated message on a snackbar indicating that the current Activity may use Chrome data (the rest of the app may not be).">
|
||||
|
|
@ -8413,7 +8413,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro
|
|||
</message>
|
||||
<message name="IDS_TWA_CLEAR_DATA_DIALOG_TITLE" desc="Title of the clear data dialog showing after user uninstalls or clears data of an app hosting a Trusted Web Activity">
|
||||
<ph name="APP_NAME">%1$s<ex>YouTube</ex></ph> also has data in Chrome
|
||||
@@ -4370,7 +4370,7 @@ To change this setting, <ph name="BEGIN_LINK"><resetlink></ph>reset sync<p
|
||||
@@ -4376,7 +4376,7 @@ To change this setting, <ph name="BEGIN_LINK"><resetlink></ph>reset sync<p
|
||||
Sending to <ph name="device_name">%1$s<ex>Tanya's Pixel 2</ex></ph>...
|
||||
</message>
|
||||
<message name="IDS_SEND_TAB_TO_SELF_NOTIFICATION_CONTEXT_TEXT" desc="Text displayed as the second line of a notification indicating the domain and the device the tab is shared from.">
|
||||
|
|
@ -8422,7 +8422,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro
|
|||
</message>
|
||||
<message name="IDS_SEND_TAB_TO_SELF_CONTENT_DESCRIPTION" desc="Accessibility string read when the bottom sheet is opened. It describes the bottom sheet where a user can pick a device to share the tab with.">
|
||||
List of devices to share a tab with.
|
||||
@@ -4409,7 +4409,7 @@ To change this setting, <ph name="BEGIN_LINK"><resetlink></ph>reset sync<p
|
||||
@@ -4415,7 +4415,7 @@ To change this setting, <ph name="BEGIN_LINK"><resetlink></ph>reset sync<p
|
||||
Page sent. To see it, open Chrome on your <ph name="device_type">%1$s<ex>phone</ex></ph>
|
||||
</message>
|
||||
<message name="IDS_SEND_TAB_TO_SELF_MANAGE_DEVICES_LINK" desc="Text with a link to a page where the user can manage the devices they can share a tab to.">
|
||||
|
|
|
|||
|
|
@ -2,16 +2,51 @@ From: csagan5 <32685696+csagan5@users.noreply.github.com>
|
|||
Date: Sun, 8 Jul 2018 18:16:34 +0200
|
||||
Subject: Disable fetching of all field trials
|
||||
|
||||
Disable seed-based field trials
|
||||
---
|
||||
android_webview/nonembedded/BUILD.gn | 2 --
|
||||
.../services/VariationsSeedServer.java | 2 --
|
||||
.../chrome_metrics_services_manager_client.cc | 2 ++
|
||||
components/ukm/ukm_recorder_impl.cc | 3 +++
|
||||
.../firstrun/VariationsSeedBridge.java | 2 +-
|
||||
.../firstrun/VariationsSeedFetcher.java | 23 ++++---------------
|
||||
.../variations/net/omnibox_http_headers.cc | 2 +-
|
||||
.../variations/net/variations_http_headers.cc | 3 +++
|
||||
.../service/variations_field_trial_creator.cc | 4 +++-
|
||||
.../variations/service/variations_service.cc | 15 +++---------
|
||||
7 files changed, 17 insertions(+), 33 deletions(-)
|
||||
10 files changed, 20 insertions(+), 38 deletions(-)
|
||||
|
||||
diff --git a/android_webview/nonembedded/BUILD.gn b/android_webview/nonembedded/BUILD.gn
|
||||
--- a/android_webview/nonembedded/BUILD.gn
|
||||
+++ b/android_webview/nonembedded/BUILD.gn
|
||||
@@ -96,7 +96,6 @@ android_library("services_java") {
|
||||
sources = [
|
||||
"java/src/org/chromium/android_webview/services/AwMinidumpUploadJobService.java",
|
||||
"java/src/org/chromium/android_webview/services/AwMinidumpUploaderDelegate.java",
|
||||
- "java/src/org/chromium/android_webview/services/AwVariationsSeedFetcher.java",
|
||||
"java/src/org/chromium/android_webview/services/ComponentUpdaterSafeModeUtils.java",
|
||||
"java/src/org/chromium/android_webview/services/ComponentsProviderPathUtil.java",
|
||||
"java/src/org/chromium/android_webview/services/ComponentsProviderService.java",
|
||||
@@ -107,7 +106,6 @@ android_library("services_java") {
|
||||
"java/src/org/chromium/android_webview/services/MetricsUploadService.java",
|
||||
"java/src/org/chromium/android_webview/services/SafeModeContentProvider.java",
|
||||
"java/src/org/chromium/android_webview/services/SafeModeService.java",
|
||||
- "java/src/org/chromium/android_webview/services/VariationsSeedHolder.java",
|
||||
"java/src/org/chromium/android_webview/services/VariationsSeedServer.java",
|
||||
]
|
||||
deps = [
|
||||
diff --git a/android_webview/nonembedded/java/src/org/chromium/android_webview/services/VariationsSeedServer.java b/android_webview/nonembedded/java/src/org/chromium/android_webview/services/VariationsSeedServer.java
|
||||
--- a/android_webview/nonembedded/java/src/org/chromium/android_webview/services/VariationsSeedServer.java
|
||||
+++ b/android_webview/nonembedded/java/src/org/chromium/android_webview/services/VariationsSeedServer.java
|
||||
@@ -30,8 +30,6 @@ public class VariationsSeedServer extends Service {
|
||||
@Override
|
||||
public void getSeed(ParcelFileDescriptor newSeedFile, long oldSeedDate,
|
||||
IVariationsSeedServerCallback callback) {
|
||||
- maybeReportMetrics(callback);
|
||||
- VariationsSeedHolder.getInstance().writeSeedIfNewer(newSeedFile, oldSeedDate);
|
||||
}
|
||||
};
|
||||
|
||||
diff --git a/chrome/browser/metrics/chrome_metrics_services_manager_client.cc b/chrome/browser/metrics/chrome_metrics_services_manager_client.cc
|
||||
--- a/chrome/browser/metrics/chrome_metrics_services_manager_client.cc
|
||||
+++ b/chrome/browser/metrics/chrome_metrics_services_manager_client.cc
|
||||
|
|
@ -122,6 +157,32 @@ diff --git a/components/variations/net/variations_http_headers.cc b/components/v
|
|||
AppendOmniboxOnDeviceSuggestionsHeaderIfNeeded(url, resource_request_);
|
||||
|
||||
// Note the criteria for attaching client experiment headers:
|
||||
diff --git a/components/variations/service/variations_field_trial_creator.cc b/components/variations/service/variations_field_trial_creator.cc
|
||||
--- a/components/variations/service/variations_field_trial_creator.cc
|
||||
+++ b/components/variations/service/variations_field_trial_creator.cc
|
||||
@@ -263,8 +263,8 @@ bool VariationsFieldTrialCreator::SetupFieldTrials(
|
||||
// instance is set.
|
||||
feature_list->RegisterExtraFeatureOverrides(extra_overrides);
|
||||
|
||||
- bool used_testing_config = false;
|
||||
#if BUILDFLAG(FIELDTRIAL_TESTING_ENABLED)
|
||||
+ bool used_testing_config = false;
|
||||
if (!command_line->HasSwitch(switches::kDisableFieldTrialTestingConfig) &&
|
||||
!command_line->HasSwitch(::switches::kForceFieldTrials) &&
|
||||
!command_line->HasSwitch(switches::kVariationsServerURL)) {
|
||||
@@ -278,10 +278,12 @@ bool VariationsFieldTrialCreator::SetupFieldTrials(
|
||||
}
|
||||
#endif // BUILDFLAG(FIELDTRIAL_TESTING_ENABLED)
|
||||
bool used_seed = false;
|
||||
+#if defined(FIELDTRIAL_SEED_ENABLED)
|
||||
if (!used_testing_config) {
|
||||
used_seed = CreateTrialsFromSeed(low_entropy_provider.get(),
|
||||
feature_list.get(), safe_seed_manager);
|
||||
}
|
||||
+#endif // BUILDFLAG(FIELDTRIAL_SEED_ENABLED)
|
||||
|
||||
platform_field_trials->SetupFeatureControllingFieldTrials(
|
||||
used_seed, low_entropy_provider.get(), feature_list.get());
|
||||
diff --git a/components/variations/service/variations_service.cc b/components/variations/service/variations_service.cc
|
||||
--- a/components/variations/service/variations_service.cc
|
||||
+++ b/components/variations/service/variations_service.cc
|
||||
|
|
|
|||
|
|
@ -1,37 +0,0 @@
|
|||
From: Daniel Micay <danielmicay@gmail.com>
|
||||
Date: Tue, 25 Dec 2018 16:19:51 -0500
|
||||
Subject: Disable seed-based field trials
|
||||
|
||||
---
|
||||
.../variations/service/variations_field_trial_creator.cc | 4 +++-
|
||||
1 file changed, 3 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/components/variations/service/variations_field_trial_creator.cc b/components/variations/service/variations_field_trial_creator.cc
|
||||
--- a/components/variations/service/variations_field_trial_creator.cc
|
||||
+++ b/components/variations/service/variations_field_trial_creator.cc
|
||||
@@ -263,8 +263,8 @@ bool VariationsFieldTrialCreator::SetupFieldTrials(
|
||||
// instance is set.
|
||||
feature_list->RegisterExtraFeatureOverrides(extra_overrides);
|
||||
|
||||
- bool used_testing_config = false;
|
||||
#if BUILDFLAG(FIELDTRIAL_TESTING_ENABLED)
|
||||
+ bool used_testing_config = false;
|
||||
if (!command_line->HasSwitch(switches::kDisableFieldTrialTestingConfig) &&
|
||||
!command_line->HasSwitch(::switches::kForceFieldTrials) &&
|
||||
!command_line->HasSwitch(switches::kVariationsServerURL)) {
|
||||
@@ -278,10 +278,12 @@ bool VariationsFieldTrialCreator::SetupFieldTrials(
|
||||
}
|
||||
#endif // BUILDFLAG(FIELDTRIAL_TESTING_ENABLED)
|
||||
bool used_seed = false;
|
||||
+#if defined(FIELDTRIAL_SEED_ENABLED)
|
||||
if (!used_testing_config) {
|
||||
used_seed = CreateTrialsFromSeed(low_entropy_provider.get(),
|
||||
feature_list.get(), safe_seed_manager);
|
||||
}
|
||||
+#endif // BUILDFLAG(FIELDTRIAL_SEED_ENABLED)
|
||||
|
||||
platform_field_trials->SetupFeatureControllingFieldTrials(
|
||||
used_seed, low_entropy_provider.get(), feature_list.get());
|
||||
--
|
||||
2.20.1
|
||||
|
||||
Loading…
Add table
Reference in a new issue