| Index: net/http/http_server_properties_impl.cc
|
| ===================================================================
|
| --- net/http/http_server_properties_impl.cc (revision 113337)
|
| +++ net/http/http_server_properties_impl.cc (working copy)
|
| @@ -8,18 +8,10 @@
|
| #include "base/memory/scoped_ptr.h"
|
| #include "base/stl_util.h"
|
| #include "base/stringprintf.h"
|
| -#include "net/http/http_pipelined_host_capability.h"
|
|
|
| namespace net {
|
|
|
| -// 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.
|
| -static const int kDefaultNumHostsToRemember = 200;
|
| -
|
| -HttpServerPropertiesImpl::HttpServerPropertiesImpl()
|
| - : pipeline_capability_map_(
|
| - new CachedPipelineCapabilityMap(kDefaultNumHostsToRemember)) {
|
| +HttpServerPropertiesImpl::HttpServerPropertiesImpl() {
|
| }
|
|
|
| HttpServerPropertiesImpl::~HttpServerPropertiesImpl() {
|
| @@ -56,21 +48,6 @@
|
| spdy_settings_map_.swap(*spdy_settings_map);
|
| }
|
|
|
| -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) const {
|
| DCHECK(CalledOnValidThread());
|
| @@ -117,7 +94,6 @@
|
| spdy_servers_table_.clear();
|
| alternate_protocol_map_.clear();
|
| spdy_settings_map_.clear();
|
| - pipeline_capability_map_->Clear();
|
| }
|
|
|
| bool HttpServerPropertiesImpl::SupportsSpdy(
|
| @@ -263,41 +239,4 @@
|
| return spdy_settings_map_;
|
| }
|
|
|
| -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;
|
| -}
|
| -
|
| } // namespace net
|
|
|