summaryrefslogtreecommitdiffstats
path: root/chrome/common
diff options
context:
space:
mode:
authorpeconn <peconn@chromium.org>2016-03-15 02:25:06 -0700
committerCommit bot <commit-bot@chromium.org>2016-03-15 09:26:25 +0000
commite9c288b43d7473906bfe1c0d8dc4bb19b0723709 (patch)
tree21494c662caf0e2aad6cf199707ca9705bc3fa64 /chrome/common
parent99cbc477a9c32e129642ad3836207b040d52e5b9 (diff)
downloadchromium_src-e9c288b43d7473906bfe1c0d8dc4bb19b0723709.zip
chromium_src-e9c288b43d7473906bfe1c0d8dc4bb19b0723709.tar.gz
chromium_src-e9c288b43d7473906bfe1c0d8dc4bb19b0723709.tar.bz2
Revert of Remove support for Alt-Svc/Alternate Protocol Probability (patchset #8 id:140001 of https://codereview.chromium.org/1699653002/ )
Reason for revert: https://bugs.chromium.org/p/chromium/issues/detail?id=594921 Basically parts of http_stream_factory_impl_unittest.cc are only compiled if ENABLE_BIDIRECTIONAL_STREAM is a build flag and you haven't updated these parts of the file. Original issue's description: > Remove support forAlt-Svc/Alternate Protocol Probability > > Committed: https://crrev.com/dced4c771d25317d26a0f6e258c7b7f64d4e8eea > Cr-Commit-Position: refs/heads/master@{#379652} > > Committed: https://crrev.com/740688bec5c66af00debe117b6d375ecd212e570 > Cr-Commit-Position: refs/heads/master@{#381134} TBR=bnc@chromium.org,eroman@chromium.org,mef@chromium.org,rch@chromium.org # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true Review URL: https://codereview.chromium.org/1802893002 Cr-Commit-Position: refs/heads/master@{#381197}
Diffstat (limited to 'chrome/common')
-rw-r--r--chrome/common/chrome_switches.cc6
-rw-r--r--chrome/common/chrome_switches.h1
2 files changed, 7 insertions, 0 deletions
diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc
index bef7213..fd0af20 100644
--- a/chrome/common/chrome_switches.cc
+++ b/chrome/common/chrome_switches.cc
@@ -66,6 +66,12 @@ const char kAllowOutdatedPlugins[] = "allow-outdated-plugins";
// URLs. This provides an override to get the old insecure behavior.
const char kAllowRunningInsecureContent[] = "allow-running-insecure-content";
+// Specifies the probability threshold for alternative services: an advertised
+// alternative service will only be honored if the advertised probability is
+// greater than or equal to this threshold.
+const char kAlternativeServiceProbabilityThreshold[] =
+ "alternative-service-probability-threshold";
+
// Prevents Chrome from requiring authorization to run certain widely installed
// but less commonly used plugins.
const char kAlwaysAuthorizePlugins[] = "always-authorize-plugins";
diff --git a/chrome/common/chrome_switches.h b/chrome/common/chrome_switches.h
index afe5c46..8fdd7a9 100644
--- a/chrome/common/chrome_switches.h
+++ b/chrome/common/chrome_switches.h
@@ -31,6 +31,7 @@ extern const char kAllowHttpScreenCapture[];
extern const char kAllowInsecureLocalhost[];
extern const char kAllowOutdatedPlugins[];
extern const char kAllowRunningInsecureContent[];
+extern const char kAlternativeServiceProbabilityThreshold[];
extern const char kAlwaysAuthorizePlugins[];
extern const char kAppId[];
extern const char kApp[];