SPDY - integration of spdy/3 code.

net/http/http_server_properties_impl.cc

-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/http/http_server_properties_impl.h"
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/stl_util.h"
 #include "base/stringprintf.h"
 #include "net/http/http_pipelined_host_capability.h"
@@ skipping 222 matching lines @@
     const HostPortPair& host_port_pair,
     const spdy::SpdySettings& settings) {
   spdy::SpdySettings persistent_settings;
 
   // Iterate through the list, and only copy those settings which are marked
   // for persistence.
   spdy::SpdySettings::const_iterator it;
   for (it = settings.begin(); it != settings.end(); ++it) {
     spdy::SettingsFlagsAndId id = it->first;
     if (id.flags() & spdy::SETTINGS_FLAG_PLEASE_PERSIST) {
-      id.set_flags(spdy::SETTINGS_FLAG_PERSISTED);
-      persistent_settings.push_back(std::make_pair(id, it->second));
+      spdy::SettingsFlagsAndId new_id(spdy::SETTINGS_FLAG_PERSISTED, id.id());
+      persistent_settings.push_back(std::make_pair(new_id, it->second));
     }
   }
 
   // If we didn't persist anything, then we are done.
   if (persistent_settings.empty())
     return false;
 
   spdy_settings_map_[host_port_pair] = persistent_settings;
   return true;
 }
 
+bool HttpServerPropertiesImpl::SetSpdySetting(
+    const HostPortPair& host_port_pair,
+    const spdy::SpdySetting& setting) {
+
+  spdy::SettingsFlagsAndId id = setting.first;
+  if (!(id.flags() & spdy::SETTINGS_FLAG_PLEASE_PERSIST))
+      return false;
+
+  SpdySettingsMap::const_iterator it = spdy_settings_map_.find(host_port_pair);
+  spdy::SpdySettings persistent_settings;
+  if (it != spdy_settings_map_.end()) {
+    persistent_settings = it->second;
+  }
+
+  spdy::SettingsFlagsAndId new_id(spdy::SETTINGS_FLAG_PERSISTED, id.id());
+  persistent_settings.push_back(std::make_pair(new_id, setting.second));
+  spdy_settings_map_[host_port_pair] = persistent_settings;
+
+  return true;
+}
+
 void HttpServerPropertiesImpl::ClearSpdySettings() {
   spdy_settings_map_.clear();
 }
 
 const SpdySettingsMap&
 HttpServerPropertiesImpl::spdy_settings_map() const {
   return spdy_settings_map_;
 }
 
 HttpPipelinedHostCapability HttpServerPropertiesImpl::GetPipelineCapability(
@@ skipping 27 matching lines @@
   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