SPDY - integration of spdy/3 code.

chrome/browser/net/http_server_properties_manager.cc

 // 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 "chrome/browser/net/http_server_properties_manager.h"
 
 #include "base/bind.h"
 #include "base/stl_util.h"
 #include "base/values.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/common/chrome_notification_types.h"
@@ skipping 141 matching lines @@
     const net::HostPortPair& host_port_pair,
     const spdy::SpdySettings& settings) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   bool persist = http_server_properties_impl_->SetSpdySettings(
       host_port_pair, settings);
   if (persist)
     ScheduleUpdatePrefsOnIO();
   return persist;
 }
 
+bool HttpServerPropertiesManager::SetSpdySetting(
+    const net::HostPortPair& host_port_pair,
+    const spdy::SpdySetting& setting) {
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
+  bool persist = http_server_properties_impl_->SetSpdySetting(
+      host_port_pair, setting);
+  if (persist)
+    ScheduleUpdatePrefsOnIO();
+  return persist;
+}
+
 void HttpServerPropertiesManager::ClearSpdySettings() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   http_server_properties_impl_->ClearSpdySettings();
   ScheduleUpdatePrefsOnIO();
 }
 
 const net::SpdySettingsMap&
 HttpServerPropertiesManager::spdy_settings_map() const {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   return http_server_properties_impl_->spdy_settings_map();
@@ skipping 123 matching lines @@
 
         int value = 0;
         if (!spdy_setting_dict->GetIntegerWithoutPathExpansion("value",
                                                                &value)) {
           DVLOG(1) << "Malformed value in SpdySettings for server: " <<
               server_str;
           detected_corrupted_prefs = true;
           continue;
         }
 
-        spdy::SettingsFlagsAndId flags_and_id(0);
-        flags_and_id.set_id(id);
-        flags_and_id.set_flags(spdy::SETTINGS_FLAG_PERSISTED);
-
+        spdy::SettingsFlagsAndId flags_and_id(
+            spdy::SETTINGS_FLAG_PERSISTED, id);
         spdy_settings.push_back(spdy::SpdySetting(flags_and_id, value));
       }
 
       (*spdy_settings_map)[server] = spdy_settings;
     }
 
     int pipeline_capability = net::PIPELINE_UNKNOWN;
     if ((server_pref_dict->GetInteger(
          "pipeline_capability", &pipeline_capability)) &&
         pipeline_capability != net::PIPELINE_UNKNOWN) {
@@ skipping 303 matching lines @@
   std::string* pref_name = content::Details<std::string>(details).ptr();
   if (*pref_name == prefs::kHttpServerProperties) {
     if (!setting_prefs_)
       ScheduleUpdateCacheOnUI();
   } else {
     NOTREACHED();
   }
 }
 
 }  // namespace chrome_browser_net