ABANDONED Handle multiple AlternateProtocols for each HostPortPair.

net/http/http_server_properties_manager_unittest.cc

 // Copyright 2014 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_manager.h"
 
 #include "base/basictypes.h"
 #include "base/message_loop/message_loop.h"
 #include "base/prefs/pref_registry_simple.h"
 #include "base/prefs/testing_pref_service.h"
@@ skipping 138 matching lines @@
   // 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;
   HostPortPair google_server("www.google.com", 80);
   HostPortPair mail_server("mail.google.com", 80);
 
   // Set supports_spdy for www.google.com:80.
   server_pref_dict->SetBoolean("supports_spdy", true);
 
-  // Set up alternate_protocol for www.google.com:80.
+  // Set up alternative_services for www.google.com:80.
   base::DictionaryValue* alternate_protocol = new base::DictionaryValue;
   alternate_protocol->SetInteger("port", 443);
   alternate_protocol->SetString("protocol_str", "npn-spdy/3");
-  server_pref_dict->SetWithoutPathExpansion("alternate_protocol",
-                                            alternate_protocol);
+  base::ListValue* alternative_services = new base::ListValue;
+  alternative_services->Append(alternate_protocol);
+  server_pref_dict->SetWithoutPathExpansion("alternative_services",
+                                            alternative_services);
 
   // Set up SupportsQuic for www.google.com:80.
   base::DictionaryValue* supports_quic = new base::DictionaryValue;
   supports_quic->SetBoolean("used_quic", true);
   supports_quic->SetString("address", "foo");
   server_pref_dict->SetWithoutPathExpansion("supports_quic", supports_quic);
 
   // Set up ServerNetworkStats for www.google.com:80.
   base::DictionaryValue* stats = new base::DictionaryValue;
   stats->SetInteger("srtt", 10);
   server_pref_dict->SetWithoutPathExpansion("network_stats", stats);
 
   // Set the server preference for www.google.com:80.
   base::DictionaryValue* servers_dict = new base::DictionaryValue;
   servers_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 alternate_protocol for mail.google.com:80
+  // Set up alternative_services for mail.google.com:80
   base::DictionaryValue* alternate_protocol1 = new base::DictionaryValue;
   alternate_protocol1->SetInteger("port", 444);
   alternate_protocol1->SetString("protocol_str", "npn-spdy/3.1");
-
-  server_pref_dict1->SetWithoutPathExpansion("alternate_protocol",
-                                             alternate_protocol1);
+  base::ListValue* alternative_services1 = new base::ListValue;
+  alternative_services1->Append(alternate_protocol1);
+  server_pref_dict1->SetWithoutPathExpansion("alternative_services",
+                                             alternative_services1);
 
   // Set up SupportsQuic for mail.google.com:80
   base::DictionaryValue* supports_quic1 = new base::DictionaryValue;
   supports_quic1->SetBoolean("used_quic", false);
   supports_quic1->SetString("address", "bar");
   server_pref_dict1->SetWithoutPathExpansion("supports_quic", supports_quic1);
 
   // Set up ServerNetworkStats for mail.google.com:80.
   base::DictionaryValue* stats1 = new base::DictionaryValue;
   stats1->SetInteger("srtt", 20);
@@ skipping 20 matching lines @@
 
   // Verify SupportsSpdy.
   EXPECT_TRUE(http_server_props_manager_->SupportsSpdy(google_server));
   EXPECT_TRUE(http_server_props_manager_->SupportsSpdy(mail_server));
   EXPECT_FALSE(http_server_props_manager_->SupportsSpdy(
       HostPortPair::FromString("foo.google.com:1337")));
 
   // Verify AlternateProtocol.
   ASSERT_TRUE(http_server_props_manager_->HasAlternateProtocol(google_server));
   ASSERT_TRUE(http_server_props_manager_->HasAlternateProtocol(mail_server));
-  AlternateProtocolInfo port_alternate_protocol =
-      http_server_props_manager_->GetAlternateProtocol(google_server);
-  EXPECT_EQ(443, port_alternate_protocol.port);
-  EXPECT_EQ(NPN_SPDY_3, port_alternate_protocol.protocol);
-  port_alternate_protocol =
-      http_server_props_manager_->GetAlternateProtocol(mail_server);
-  EXPECT_EQ(444, port_alternate_protocol.port);
-  EXPECT_EQ(NPN_SPDY_3_1, port_alternate_protocol.protocol);
+  AlternateProtocols port_alternate_protocols =
+      http_server_props_manager_->GetAlternateProtocols(google_server);
+  ASSERT_EQ(1u, port_alternate_protocols.size());
+  EXPECT_EQ(443, port_alternate_protocols[0].port);
+  EXPECT_EQ(NPN_SPDY_3, port_alternate_protocols[0].protocol);
+  port_alternate_protocols =
+      http_server_props_manager_->GetAlternateProtocols(mail_server);
+  ASSERT_EQ(1u, port_alternate_protocols.size());
+  EXPECT_EQ(444, port_alternate_protocols[0].port);
+  EXPECT_EQ(NPN_SPDY_3_1, port_alternate_protocols[0].protocol);
 
   // Verify SupportsQuic.
   SupportsQuic supports_quic2 =
       http_server_props_manager_->GetSupportsQuic(google_server);
   EXPECT_TRUE(supports_quic2.used_quic);
   EXPECT_EQ("foo", supports_quic2.address);
   supports_quic2 = http_server_props_manager_->GetSupportsQuic(mail_server);
   EXPECT_FALSE(supports_quic2.used_quic);
   EXPECT_EQ("bar", supports_quic2.address);
 
   // Verify ServerNetworkStats.
   const ServerNetworkStats* stats2 =
       http_server_props_manager_->GetServerNetworkStats(google_server);
   EXPECT_EQ(10, stats2->srtt.ToInternalValue());
   const ServerNetworkStats* stats3 =
       http_server_props_manager_->GetServerNetworkStats(mail_server);
   EXPECT_EQ(20, stats3->srtt.ToInternalValue());
 }
 
 TEST_F(HttpServerPropertiesManagerTest, BadCachedHostPortPair) {
   ExpectCacheUpdate();
   // The prefs are automaticalls updated in the case corruption is detected.
   ExpectPrefsUpdate();
 
   base::DictionaryValue* server_pref_dict = new base::DictionaryValue;
 
   // Set supports_spdy for www.google.com:65536.
   server_pref_dict->SetBoolean("supports_spdy", true);
 
-  // Set up alternate_protocol for www.google.com:65536.
+  // Set up alternative_services for www.google.com:65536.
   base::DictionaryValue* alternate_protocol = new base::DictionaryValue;
   alternate_protocol->SetInteger("port", 80);
   alternate_protocol->SetString("protocol_str", "npn-spdy/3");
-  server_pref_dict->SetWithoutPathExpansion("alternate_protocol",
-                                            alternate_protocol);
+  base::ListValue* alternative_services = new base::ListValue;
+  alternative_services->Append(alternate_protocol);
+  server_pref_dict->SetWithoutPathExpansion("alternative_services",
+                                            alternative_services);
 
   // Set up SupportsQuic for www.google.com:65536.
   base::DictionaryValue* supports_quic = new base::DictionaryValue;
   supports_quic->SetBoolean("used_quic", true);
   supports_quic->SetString("address", "foo");
   server_pref_dict->SetWithoutPathExpansion("supports_quic", supports_quic);
 
   // Set up ServerNetworkStats for www.google.com:65536.
   base::DictionaryValue* stats = new base::DictionaryValue;
   stats->SetInteger("srtt", 10);
@@ skipping 33 matching lines @@
 TEST_F(HttpServerPropertiesManagerTest, BadCachedAltProtocolPort) {
   ExpectCacheUpdate();
   // The prefs are automaticalls updated in the case corruption is detected.
   ExpectPrefsUpdate();
 
   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 alternate_protocol for www.google.com:80.
+  // Set up alternative_services for www.google.com:80.
   base::DictionaryValue* alternate_protocol = new base::DictionaryValue;
   alternate_protocol->SetInteger("port", 65536);
   alternate_protocol->SetString("protocol_str", "npn-spdy/3");
-  server_pref_dict->SetWithoutPathExpansion("alternate_protocol",
-                                            alternate_protocol);
+  base::ListValue* alternative_services = new base::ListValue;
+  alternative_services->Append(alternate_protocol);
+  server_pref_dict->SetWithoutPathExpansion("alternative_services",
+                                            alternative_services);
 
   // Set the server preference for www.google.com:80.
   base::DictionaryValue* servers_dict = new base::DictionaryValue;
   servers_dict->SetWithoutPathExpansion("www.google.com:80", server_pref_dict);
 
   base::DictionaryValue* http_server_properties_dict =
       new base::DictionaryValue;
   HttpServerPropertiesManager::SetVersion(http_server_properties_dict, -1);
   http_server_properties_dict->SetWithoutPathExpansion("servers", servers_dict);
 
@@ skipping 127 matching lines @@
 
   Mock::VerifyAndClearExpectations(http_server_props_manager_.get());
 }
 
 TEST_F(HttpServerPropertiesManagerTest, HasAlternateProtocol) {
   ExpectPrefsUpdate();
 
   HostPortPair spdy_server_mail("mail.google.com", 80);
   EXPECT_FALSE(
       http_server_props_manager_->HasAlternateProtocol(spdy_server_mail));
-  http_server_props_manager_->SetAlternateProtocol(spdy_server_mail, 443,
+  http_server_props_manager_->AddAlternateProtocol(spdy_server_mail, 443,
                                                    NPN_SPDY_3, 1);
 
   // Run the task.
   base::RunLoop().RunUntilIdle();
   Mock::VerifyAndClearExpectations(http_server_props_manager_.get());
 
   ASSERT_TRUE(
       http_server_props_manager_->HasAlternateProtocol(spdy_server_mail));
-  AlternateProtocolInfo port_alternate_protocol =
-      http_server_props_manager_->GetAlternateProtocol(spdy_server_mail);
-  EXPECT_EQ(443, port_alternate_protocol.port);
-  EXPECT_EQ(NPN_SPDY_3, port_alternate_protocol.protocol);
+  AlternateProtocols port_alternate_protocols =
+      http_server_props_manager_->GetAlternateProtocols(spdy_server_mail);
+  ASSERT_EQ(1u, port_alternate_protocols.size());
+  EXPECT_EQ(443, port_alternate_protocols[0].port);
+  EXPECT_EQ(NPN_SPDY_3, port_alternate_protocols[0].protocol);
 }
 
 TEST_F(HttpServerPropertiesManagerTest, SupportsQuic) {
   ExpectPrefsUpdate();
 
   HostPortPair quic_server_mail("mail.google.com", 80);
   SupportsQuic supports_quic =
       http_server_props_manager_->GetSupportsQuic(quic_server_mail);
   EXPECT_FALSE(supports_quic.used_quic);
   EXPECT_EQ("", supports_quic.address);
@@ skipping 27 matching lines @@
   const ServerNetworkStats* stats2 =
       http_server_props_manager_->GetServerNetworkStats(mail_server);
   EXPECT_EQ(10, stats2->srtt.ToInternalValue());
 }
 
 TEST_F(HttpServerPropertiesManagerTest, Clear) {
   ExpectPrefsUpdate();
 
   HostPortPair spdy_server_mail("mail.google.com", 443);
   http_server_props_manager_->SetSupportsSpdy(spdy_server_mail, true);
-  http_server_props_manager_->SetAlternateProtocol(spdy_server_mail, 443,
+  http_server_props_manager_->AddAlternateProtocol(spdy_server_mail, 443,
                                                    NPN_SPDY_3, 1);
   http_server_props_manager_->SetSupportsQuic(spdy_server_mail, true, "foo");
   ServerNetworkStats stats;
   stats.srtt = base::TimeDelta::FromMicroseconds(10);
   http_server_props_manager_->SetServerNetworkStats(spdy_server_mail, stats);
 
   const SpdySettingsIds id1 = SETTINGS_UPLOAD_BANDWIDTH;
   const SpdySettingsFlags flags1 = SETTINGS_FLAG_PLEASE_PERSIST;
   const uint32 value1 = 31337;
   http_server_props_manager_->SetSpdySetting(
@@ skipping 42 matching lines @@
       http_server_props_manager_->GetServerNetworkStats(spdy_server_mail);
   EXPECT_EQ(NULL, stats2);
 
   const SettingsMap& settings_map2_ret =
       http_server_props_manager_->GetSpdySettings(spdy_server_mail);
   EXPECT_EQ(0U, settings_map2_ret.size());
 
   Mock::VerifyAndClearExpectations(http_server_props_manager_.get());
 }
 
-// crbug.com/444956: Add 200 alternate_protocol servers followed by
+// https://crbug.com/444956: Add 200 alternate_protocol servers followed by
 // supports_quic and verify we have read supports_quic from prefs.
 TEST_F(HttpServerPropertiesManagerTest, BadSupportsQuic) {
   ExpectCacheUpdate();
 
   base::DictionaryValue* servers_dict = new base::DictionaryValue;
 
   for (int i = 0; i < 200; ++i) {
     // Set up alternate_protocol for www.google.com:i.
     base::DictionaryValue* alternate_protocol = new base::DictionaryValue;
     alternate_protocol->SetInteger("port", i);
     alternate_protocol->SetString("protocol_str", "npn-spdy/3");
+    base::ListValue* alternative_services = new base::ListValue;
+    alternative_services->Append(alternate_protocol);
     base::DictionaryValue* server_pref_dict = new base::DictionaryValue;
-    server_pref_dict->SetWithoutPathExpansion("alternate_protocol",
-                                              alternate_protocol);
+    server_pref_dict->SetWithoutPathExpansion("alternative_services",
+                                              alternative_services);
     servers_dict->SetWithoutPathExpansion(StringPrintf("www.google.com:%d", i),
                                           server_pref_dict);
   }
 
   // Set the preference for mail.google.com server.
   base::DictionaryValue* server_pref_dict1 = new base::DictionaryValue;
   // Set up SupportsQuic for mail.google.com:80
   base::DictionaryValue* supports_quic = new base::DictionaryValue;
   supports_quic->SetBoolean("used_quic", true);
   supports_quic->SetString("address", "bar");
@@ skipping 12 matching lines @@
   pref_service_.SetManagedPref(kTestHttpServerProperties,
                                http_server_properties_dict);
 
   base::RunLoop().RunUntilIdle();
   Mock::VerifyAndClearExpectations(http_server_props_manager_.get());
 
   // Verify AlternateProtocol.
   for (int i = 0; i < 200; ++i) {
     std::string server = StringPrintf("www.google.com:%d", i);
     ASSERT_TRUE(http_server_props_manager_->HasAlternateProtocol(
-        net::HostPortPair::FromString(server)));
-    net::AlternateProtocolInfo port_alternate_protocol =
-        http_server_props_manager_->GetAlternateProtocol(
-            net::HostPortPair::FromString(server));
-    EXPECT_EQ(i, port_alternate_protocol.port);
-    EXPECT_EQ(net::NPN_SPDY_3, port_alternate_protocol.protocol);
+        HostPortPair::FromString(server)));
+    AlternateProtocols port_alternate_protocols =
+        http_server_props_manager_->GetAlternateProtocols(
+            HostPortPair::FromString(server));
+    EXPECT_EQ(1u, port_alternate_protocols.size());
+    EXPECT_EQ(i, port_alternate_protocols[0].port);
+    EXPECT_EQ(NPN_SPDY_3, port_alternate_protocols[0].protocol);
   }
 
   // Verify SupportsQuic.
-  net::SupportsQuic supports_quic1 =
-      http_server_props_manager_->GetSupportsQuic(
-          net::HostPortPair::FromString("mail.google.com:80"));
+  SupportsQuic supports_quic1 = http_server_props_manager_->GetSupportsQuic(
+      HostPortPair::FromString("mail.google.com:80"));
   EXPECT_TRUE(supports_quic1.used_quic);
   EXPECT_EQ("bar", supports_quic1.address);
 }
 
 TEST_F(HttpServerPropertiesManagerTest, ShutdownWithPendingUpdateCache0) {
   // Post an update task to the UI thread.
   http_server_props_manager_->ScheduleUpdateCacheOnPrefThread();
   // Shutdown comes before the task is executed.
   http_server_props_manager_->ShutdownOnPrefThread();
   http_server_props_manager_.reset();
@@ skipping 59 matching lines @@
   // Run the task after shutdown, but before deletion.
   base::RunLoop().RunUntilIdle();
   Mock::VerifyAndClearExpectations(http_server_props_manager_.get());
   http_server_props_manager_.reset();
   base::RunLoop().RunUntilIdle();
 }
 
 }  // namespace
 
 }  // namespace net