84 lines
3.6 KiB
Diff
84 lines
3.6 KiB
Diff
From: csagan5 <32685696+csagan5@users.noreply.github.com>
|
|
Date: Sun, 8 Jul 2018 18:16:34 +0200
|
|
Subject: Disable fetching of all field trials
|
|
|
|
---
|
|
.../browser/flags/ChromeFeatureList.java | 19 ++++---------------
|
|
.../variations/service/variations_service.cc | 12 +-----------
|
|
2 files changed, 5 insertions(+), 26 deletions(-)
|
|
|
|
diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
|
|
--- a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
|
|
+++ b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
|
|
@@ -122,9 +122,7 @@ public abstract class ChromeFeatureList {
|
|
* the specified parameter does not exist.
|
|
*/
|
|
public static String getFieldTrialParamByFeature(String featureName, String paramName) {
|
|
- if (FeatureList.hasTestFeatures()) return "";
|
|
- assert FeatureList.isInitialized();
|
|
- return ChromeFeatureListJni.get().getFieldTrialParamByFeature(featureName, paramName);
|
|
+ return "";
|
|
}
|
|
|
|
/**
|
|
@@ -141,10 +139,7 @@ public abstract class ChromeFeatureList {
|
|
*/
|
|
public static int getFieldTrialParamByFeatureAsInt(
|
|
String featureName, String paramName, int defaultValue) {
|
|
- if (FeatureList.hasTestFeatures()) return defaultValue;
|
|
- assert FeatureList.isInitialized();
|
|
- return ChromeFeatureListJni.get().getFieldTrialParamByFeatureAsInt(
|
|
- featureName, paramName, defaultValue);
|
|
+ return defaultValue;
|
|
}
|
|
|
|
/**
|
|
@@ -161,10 +156,7 @@ public abstract class ChromeFeatureList {
|
|
*/
|
|
public static double getFieldTrialParamByFeatureAsDouble(
|
|
String featureName, String paramName, double defaultValue) {
|
|
- if (FeatureList.hasTestFeatures()) return defaultValue;
|
|
- assert FeatureList.isInitialized();
|
|
- return ChromeFeatureListJni.get().getFieldTrialParamByFeatureAsDouble(
|
|
- featureName, paramName, defaultValue);
|
|
+ return defaultValue;
|
|
}
|
|
|
|
/**
|
|
@@ -181,10 +173,7 @@ public abstract class ChromeFeatureList {
|
|
*/
|
|
public static boolean getFieldTrialParamByFeatureAsBoolean(
|
|
String featureName, String paramName, boolean defaultValue) {
|
|
- if (FeatureList.hasTestFeatures()) return defaultValue;
|
|
- assert FeatureList.isInitialized();
|
|
- return ChromeFeatureListJni.get().getFieldTrialParamByFeatureAsBoolean(
|
|
- featureName, paramName, defaultValue);
|
|
+ return defaultValue;
|
|
}
|
|
|
|
/** Alphabetical: */
|
|
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
|
|
@@ -236,17 +236,7 @@ bool GetInstanceManipulations(const net::HttpResponseHeaders* headers,
|
|
// Variations seed fetching is only enabled in official Chrome builds, if a URL
|
|
// is specified on the command line, and for testing.
|
|
bool IsFetchingEnabled() {
|
|
-#if !BUILDFLAG(GOOGLE_CHROME_BRANDING)
|
|
- if (!base::CommandLine::ForCurrentProcess()->HasSwitch(
|
|
- switches::kVariationsServerURL) &&
|
|
- !g_should_fetch_for_testing) {
|
|
- DVLOG(1)
|
|
- << "Not performing repeated fetching in unofficial build without --"
|
|
- << switches::kVariationsServerURL << " specified.";
|
|
- return false;
|
|
- }
|
|
-#endif
|
|
- return true;
|
|
+ return false;
|
|
}
|
|
|
|
std::unique_ptr<SeedResponse> MaybeImportFirstRunSeed(
|
|
--
|
|
2.17.1
|
|
|