| Index: net/http/http_server_properties_manager.cc
|
| diff --git a/net/http/http_server_properties_manager.cc b/net/http/http_server_properties_manager.cc
|
| index f8d133c91b0bd3fda6dd03c1c4392e1f7eb08c4a..a592f441bb09eb71cb7371d421b33e5fb63f5600 100644
|
| --- a/net/http/http_server_properties_manager.cc
|
| +++ b/net/http/http_server_properties_manager.cc
|
| @@ -61,7 +61,6 @@ const char kAlternativeServiceKey[] = "alternative_service";
|
| const char kProtocolKey[] = "protocol_str";
|
| const char kHostKey[] = "host";
|
| const char kPortKey[] = "port";
|
| -const char kProbabilityKey[] = "probability";
|
| const char kExpirationKey[] = "expiration";
|
| const char kNetworkStatsKey[] = "network_stats";
|
| const char kSrttKey[] = "srtt";
|
| @@ -195,11 +194,10 @@ AlternativeServiceVector HttpServerPropertiesManager::GetAlternativeServices(
|
| bool HttpServerPropertiesManager::SetAlternativeService(
|
| const HostPortPair& origin,
|
| const AlternativeService& alternative_service,
|
| - double alternative_probability,
|
| base::Time expiration) {
|
| DCHECK(network_task_runner_->RunsTasksOnCurrentThread());
|
| const bool changed = http_server_properties_impl_->SetAlternativeService(
|
| - origin, alternative_service, alternative_probability, expiration);
|
| + origin, alternative_service, expiration);
|
| if (changed) {
|
| ScheduleUpdatePrefsOnNetworkThread(SET_ALTERNATIVE_SERVICES);
|
| }
|
| @@ -288,13 +286,6 @@ HttpServerPropertiesManager::GetAlternativeServiceInfoAsValue()
|
| return http_server_properties_impl_->GetAlternativeServiceInfoAsValue();
|
| }
|
|
|
| -void HttpServerPropertiesManager::SetAlternativeServiceProbabilityThreshold(
|
| - double threshold) {
|
| - DCHECK(network_task_runner_->RunsTasksOnCurrentThread());
|
| - http_server_properties_impl_->SetAlternativeServiceProbabilityThreshold(
|
| - threshold);
|
| -}
|
| -
|
| const SettingsMap& HttpServerPropertiesManager::GetSpdySettings(
|
| const HostPortPair& host_port_pair) {
|
| DCHECK(network_task_runner_->RunsTasksOnCurrentThread());
|
| @@ -662,16 +653,6 @@ bool HttpServerPropertiesManager::ParseAlternativeServiceDict(
|
| alternative_service_info->alternative_service.port =
|
| static_cast<uint32_t>(port);
|
|
|
| - // Probability is optional, defaults to 1.0.
|
| - alternative_service_info->probability = 1.0;
|
| - if (alternative_service_dict.HasKey(kProbabilityKey) &&
|
| - !alternative_service_dict.GetDoubleWithoutPathExpansion(
|
| - kProbabilityKey, &(alternative_service_info->probability))) {
|
| - DVLOG(1) << "Malformed alternative service probability for server: "
|
| - << server_str;
|
| - return false;
|
| - }
|
| -
|
| // Expiration is optional, defaults to one day.
|
| base::Time expiration;
|
| if (!alternative_service_dict.HasKey(kExpirationKey)) {
|
| @@ -1196,8 +1177,6 @@ void HttpServerPropertiesManager::SaveAlternativeServiceToServerPrefs(
|
| }
|
| alternative_service_dict->SetString(
|
| kProtocolKey, AlternateProtocolToString(alternative_service.protocol));
|
| - alternative_service_dict->SetDouble(kProbabilityKey,
|
| - alternative_service_info.probability);
|
| // JSON cannot store int64_t, so expiration is converted to a string.
|
| alternative_service_dict->SetString(
|
| kExpirationKey,
|
|
|