SPDY - don't persist SpdySettings until we convert it to a map.

chrome/browser/net/http_server_properties_manager_unittest.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/basictypes.h"
 #include "base/message_loop.h"
 #include "base/values.h"
 #include "chrome/common/pref_names.h"
@@ skipping 121 matching lines @@
   ExpectCacheUpdate();
 
   // Set up the prefs for www.google.com:80 and mail.google.com:80 and then set
   // it twice. Only expect a single cache update.
 
   base::DictionaryValue* server_pref_dict = new base::DictionaryValue;
 
   // Set supports_spdy for www.google.com:80.
   server_pref_dict->SetBoolean("supports_spdy", true);
 
-  // Set up the SpdySettings for www.google.com:80.
-  base::ListValue* spdy_settings_list = new base::ListValue;
-  base::DictionaryValue* spdy_setting_dict = new base::DictionaryValue;
-  spdy_setting_dict->SetInteger("flags", spdy::SETTINGS_FLAG_PERSISTED);
-  spdy_setting_dict->SetInteger("id", 1234);
-  spdy_setting_dict->SetInteger("value", 31337);
-  spdy_settings_list->Append(spdy_setting_dict);
-  server_pref_dict->Set("settings", spdy_settings_list);
-
   // Set up alternate_protocol for www.google.com:80.
   base::DictionaryValue* alternate_protocol = new base::DictionaryValue;
   alternate_protocol->SetInteger("port", 443);
   alternate_protocol->SetInteger("protocol", static_cast<int>(net::NPN_SPDY_1));
   server_pref_dict->SetWithoutPathExpansion(
       "alternate_protocol", alternate_protocol);
 
   // Set pipeline capability for www.google.com:80.
   server_pref_dict->SetInteger("pipeline_capability", net::PIPELINE_CAPABLE);
 
   // Set the server preference for www.google.com:80.
   base::DictionaryValue* http_server_properties_dict =
       new base::DictionaryValue;
   http_server_properties_dict->SetWithoutPathExpansion(
       "www.google.com:80", server_pref_dict);
 
   // Set the preference for mail.google.com server.
   base::DictionaryValue* server_pref_dict1 = new base::DictionaryValue;
 
   // Set supports_spdy for mail.google.com:80
   server_pref_dict1->SetBoolean("supports_spdy", true);
 
-  // Set up the SpdySettings for mail.google.com:80
-  base::ListValue* spdy_settings_list1 = new base::ListValue;
-  base::DictionaryValue* spdy_setting_dict1 = new base::DictionaryValue;
-  spdy_setting_dict1->SetInteger("flags", spdy::SETTINGS_FLAG_PERSISTED);
-  spdy_setting_dict1->SetInteger("id", 5678);
-  spdy_setting_dict1->SetInteger("value", 62667);
-  spdy_settings_list1->Append(spdy_setting_dict1);
-  server_pref_dict1->Set("settings", spdy_settings_list1);
-
   // Set up alternate_protocol for mail.google.com:80
   base::DictionaryValue* alternate_protocol1 = new base::DictionaryValue;
   alternate_protocol1->SetInteger("port", 444);
   alternate_protocol1->SetInteger(
       "protocol", static_cast<int>(net::NPN_SPDY_2));
   server_pref_dict1->SetWithoutPathExpansion(
       "alternate_protocol", alternate_protocol1);
 
   // Set pipelining capability for mail.google.com:80
   server_pref_dict1->SetInteger("pipeline_capability", net::PIPELINE_INCAPABLE);
@@ skipping 14 matching lines @@
   Mock::VerifyAndClearExpectations(http_server_props_manager_.get());
 
   // Verify SupportsSpdy.
   EXPECT_TRUE(http_server_props_manager_->SupportsSpdy(
       net::HostPortPair::FromString("www.google.com:80")));
   EXPECT_TRUE(http_server_props_manager_->SupportsSpdy(
       net::HostPortPair::FromString("mail.google.com:80")));
   EXPECT_FALSE(http_server_props_manager_->SupportsSpdy(
       net::HostPortPair::FromString("foo.google.com:1337")));
 
-  // Verify SpdySettings.
-  spdy::SpdySettings spdy_settings_ret =
-      http_server_props_manager_->GetSpdySettings(
-          net::HostPortPair::FromString("www.google.com:80"));
-  ASSERT_EQ(1U, spdy_settings_ret.size());
-  spdy::SpdySetting spdy_setting1_ret = spdy_settings_ret.front();
-  spdy::SettingsFlagsAndId id1_ret(spdy_setting1_ret.first);
-  EXPECT_EQ(1234U, id1_ret.id());
-  EXPECT_EQ(spdy::SETTINGS_FLAG_PERSISTED, id1_ret.flags());
-  EXPECT_EQ(31337u, spdy_setting1_ret.second);
-  spdy_settings_ret = http_server_props_manager_->GetSpdySettings(
-          net::HostPortPair::FromString("mail.google.com:80"));
-  ASSERT_EQ(1U, spdy_settings_ret.size());
-  spdy_setting1_ret = spdy_settings_ret.front();
-  id1_ret = spdy_setting1_ret.first;
-  EXPECT_EQ(5678U, id1_ret.id());
-  EXPECT_EQ(spdy::SETTINGS_FLAG_PERSISTED, id1_ret.flags());
-  EXPECT_EQ(62667u, spdy_setting1_ret.second);
-
   // Verify AlternateProtocol.
   ASSERT_TRUE(http_server_props_manager_->HasAlternateProtocol(
       net::HostPortPair::FromString("www.google.com:80")));
   ASSERT_TRUE(http_server_props_manager_->HasAlternateProtocol(
       net::HostPortPair::FromString("mail.google.com:80")));
   net::PortAlternateProtocolPair port_alternate_protocol =
       http_server_props_manager_->GetAlternateProtocol(
           net::HostPortPair::FromString("www.google.com:80"));
   EXPECT_EQ(443, port_alternate_protocol.port);
   EXPECT_EQ(net::NPN_SPDY_1, port_alternate_protocol.protocol);
@@ skipping 253 matching lines @@
   // Run the task after shutdown, but before deletion.
   loop_.RunAllPending();
   Mock::VerifyAndClearExpectations(http_server_props_manager_.get());
   http_server_props_manager_.reset();
   loop_.RunAllPending();
 }
 
 }  // namespace
 
 }  // namespace chrome_browser_net