| Index: net/http/http_server_properties_impl.cc
|
| diff --git a/net/http/http_server_properties_impl.cc b/net/http/http_server_properties_impl.cc
|
| index bd7de2f8239a26a3aba43d22407bfebec49b9bb0..45d87583de775a5738f5f475d5b239377dfbdd68 100644
|
| --- a/net/http/http_server_properties_impl.cc
|
| +++ b/net/http/http_server_properties_impl.cc
|
| @@ -11,17 +11,11 @@
|
| #include "base/stl_util.h"
|
| #include "base/strings/string_util.h"
|
| #include "base/strings/stringprintf.h"
|
| -#include "net/http/http_pipelined_host_capability.h"
|
|
|
| namespace net {
|
|
|
| namespace {
|
|
|
| -// TODO(simonjam): Run experiments with different values of this to see what
|
| -// value is good at avoiding evictions without eating too much memory. Until
|
| -// then, this is just a bad guess.
|
| -const int kDefaultNumHostsToRemember = 200;
|
| -
|
| const uint64 kBrokenAlternateProtocolDelaySecs = 300;
|
|
|
| } // namespace
|
| @@ -32,8 +26,6 @@ HttpServerPropertiesImpl::HttpServerPropertiesImpl()
|
| alternate_protocol_experiment_(
|
| ALTERNATE_PROTOCOL_NOT_PART_OF_EXPERIMENT),
|
| spdy_settings_map_(SpdySettingsMap::NO_AUTO_EVICT),
|
| - pipeline_capability_map_(
|
| - new CachedPipelineCapabilityMap(kDefaultNumHostsToRemember)),
|
| weak_ptr_factory_(this) {
|
| canoncial_suffixes_.push_back(".c.youtube.com");
|
| canoncial_suffixes_.push_back(".googlevideo.com");
|
| @@ -109,21 +101,6 @@ void HttpServerPropertiesImpl::InitializeSpdySettingsServers(
|
| }
|
| }
|
|
|
| -void HttpServerPropertiesImpl::InitializePipelineCapabilities(
|
| - const PipelineCapabilityMap* pipeline_capability_map) {
|
| - PipelineCapabilityMap::const_iterator it;
|
| - pipeline_capability_map_->Clear();
|
| - for (it = pipeline_capability_map->begin();
|
| - it != pipeline_capability_map->end(); ++it) {
|
| - pipeline_capability_map_->Put(it->first, it->second);
|
| - }
|
| -}
|
| -
|
| -void HttpServerPropertiesImpl::SetNumPipelinedHostsToRemember(int max_size) {
|
| - DCHECK(pipeline_capability_map_->empty());
|
| - pipeline_capability_map_.reset(new CachedPipelineCapabilityMap(max_size));
|
| -}
|
| -
|
| void HttpServerPropertiesImpl::GetSpdyServerList(
|
| base::ListValue* spdy_server_list,
|
| size_t max_size) const {
|
| @@ -178,7 +155,6 @@ void HttpServerPropertiesImpl::Clear() {
|
| spdy_servers_map_.Clear();
|
| alternate_protocol_map_.Clear();
|
| spdy_settings_map_.Clear();
|
| - pipeline_capability_map_->Clear();
|
| }
|
|
|
| bool HttpServerPropertiesImpl::SupportsSpdy(
|
| @@ -430,43 +406,6 @@ HttpServerPropertiesImpl::GetServerNetworkStats(
|
| return &it->second;
|
| }
|
|
|
| -HttpPipelinedHostCapability HttpServerPropertiesImpl::GetPipelineCapability(
|
| - const HostPortPair& origin) {
|
| - HttpPipelinedHostCapability capability = PIPELINE_UNKNOWN;
|
| - CachedPipelineCapabilityMap::const_iterator it =
|
| - pipeline_capability_map_->Get(origin);
|
| - if (it != pipeline_capability_map_->end()) {
|
| - capability = it->second;
|
| - }
|
| - return capability;
|
| -}
|
| -
|
| -void HttpServerPropertiesImpl::SetPipelineCapability(
|
| - const HostPortPair& origin,
|
| - HttpPipelinedHostCapability capability) {
|
| - CachedPipelineCapabilityMap::iterator it =
|
| - pipeline_capability_map_->Peek(origin);
|
| - if (it == pipeline_capability_map_->end() ||
|
| - it->second != PIPELINE_INCAPABLE) {
|
| - pipeline_capability_map_->Put(origin, capability);
|
| - }
|
| -}
|
| -
|
| -void HttpServerPropertiesImpl::ClearPipelineCapabilities() {
|
| - pipeline_capability_map_->Clear();
|
| -}
|
| -
|
| -PipelineCapabilityMap
|
| -HttpServerPropertiesImpl::GetPipelineCapabilityMap() const {
|
| - PipelineCapabilityMap result;
|
| - CachedPipelineCapabilityMap::const_iterator it;
|
| - for (it = pipeline_capability_map_->begin();
|
| - it != pipeline_capability_map_->end(); ++it) {
|
| - result[it->first] = it->second;
|
| - }
|
| - return result;
|
| -}
|
| -
|
| HttpServerPropertiesImpl::CanonicalHostMap::const_iterator
|
| HttpServerPropertiesImpl::GetCanonicalHost(HostPortPair server) const {
|
| for (size_t i = 0; i < canoncial_suffixes_.size(); ++i) {
|
|
|