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/json/json_writer.h"
 #include "base/message_loop/message_loop.h"
 #include "base/prefs/pref_registry_simple.h"
@@ skipping 118 matching lines @@
   void ExpectPrefsUpdateRepeatedly() {
     EXPECT_CALL(*http_server_props_manager_,
                 UpdatePrefsFromCacheOnNetworkThread(_))
         .WillRepeatedly(
             Invoke(http_server_props_manager_.get(),
                    &TestingHttpServerPropertiesManager::
                        UpdatePrefsFromCacheOnNetworkThreadConcrete));
   }
 
   bool HasAlternateProtocol(const HostPortPair& server) {
-    const AlternateProtocolInfo alternate =
-        http_server_props_manager_->GetAlternateProtocol(server);
-    return alternate.protocol != UNINITIALIZED_ALTERNATE_PROTOCOL;
+    const AlternateProtocols alternates =
+        http_server_props_manager_->GetAlternateProtocols(server);
+    return !alternates.empty();
   }
 
   //base::RunLoop loop_;
   TestingPrefServiceSimple pref_service_;
   scoped_ptr<TestingHttpServerPropertiesManager> http_server_props_manager_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(HttpServerPropertiesManagerTest);
 };
 
 TEST_F(HttpServerPropertiesManagerTest,
        SingleUpdateForTwoSpdyServerPrefChanges) {
   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;
   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.
-  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);
+  // Set up alternative_services for www.google.com:80.
+  base::DictionaryValue* alternate_protocol0 = new base::DictionaryValue;
+  alternate_protocol0->SetInteger("port", 443);
+  alternate_protocol0->SetString("protocol_str", "npn-spdy/3");
+  base::DictionaryValue* alternate_protocol1 = new base::DictionaryValue;
+  alternate_protocol1->SetInteger("port", 1234);
+  alternate_protocol1->SetString("protocol_str", "quic");
+  base::ListValue* alternative_services = new base::ListValue;
+  alternative_services->Append(alternate_protocol0);
+  alternative_services->Append(alternate_protocol1);
+  server_pref_dict->SetWithoutPathExpansion("alternative_services",
+                                            alternative_services);
 
   // 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
-  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);
+  // Set up alternative_services for mail.google.com:80
+  base::DictionaryValue* alternate_protocol2 = new base::DictionaryValue;
+  alternate_protocol2->SetInteger("port", 444);
+  alternate_protocol2->SetString("protocol_str", "npn-spdy/3.1");
+  base::ListValue* alternative_services1 = new base::ListValue;
+  alternative_services1->Append(alternate_protocol2);
+  server_pref_dict1->SetWithoutPathExpansion("alternative_services",
+                                             alternative_services1);
 
   // Set up ServerNetworkStats for mail.google.com:80.
   base::DictionaryValue* stats1 = new base::DictionaryValue;
   stats1->SetInteger("srtt", 20);
   server_pref_dict1->SetWithoutPathExpansion("network_stats", stats1);
   // Set the server preference for mail.google.com:80.
   servers_dict->SetWithoutPathExpansion("mail.google.com:80",
                                         server_pref_dict1);
 
   base::DictionaryValue* http_server_properties_dict =
@@ skipping 18 matching lines @@
   Mock::VerifyAndClearExpectations(http_server_props_manager_.get());
 
   // Verify SupportsSpdy.
   EXPECT_TRUE(
       http_server_props_manager_->SupportsRequestPriority(google_server));
   EXPECT_TRUE(http_server_props_manager_->SupportsRequestPriority(mail_server));
   EXPECT_FALSE(http_server_props_manager_->SupportsRequestPriority(
       HostPortPair::FromString("foo.google.com:1337")));
 
   // Verify AlternateProtocol.
-  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);
+  const AlternateProtocolMap& map =
+      http_server_props_manager_->alternate_protocol_map();
+  AlternateProtocolMap::const_iterator www_it = map.Peek(google_server);
+  ASSERT_TRUE(www_it != map.end());
+  const AlternateProtocols alternate_protocols0 = www_it->second;
+  ASSERT_EQ(2u, alternate_protocols0.size());
+  EXPECT_EQ(443, alternate_protocols0[0].port);
+  EXPECT_EQ(NPN_SPDY_3, alternate_protocols0[0].protocol);
+  EXPECT_EQ(1234, alternate_protocols0[1].port);
+  EXPECT_EQ(QUIC, alternate_protocols0[1].protocol);
+  AlternateProtocolMap::const_iterator mail_it = map.Peek(mail_server);
+  ASSERT_TRUE(mail_it != map.end());
+  const AlternateProtocols alternate_protocols1 = mail_it->second;
+  ASSERT_EQ(1u, alternate_protocols1.size());
+  EXPECT_EQ(444, alternate_protocols1[0].port);
+  EXPECT_EQ(NPN_SPDY_3_1, alternate_protocols1[0].protocol);
 
   // Verify SupportsQuic.
   IPAddressNumber last_address;
   EXPECT_TRUE(http_server_props_manager_->GetSupportsQuic(&last_address));
   EXPECT_EQ("127.0.0.1", IPAddressToString(last_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 ServerNetworkStats for www.google.com:65536.
   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:65536.
   base::DictionaryValue* servers_dict = new base::DictionaryValue;
   servers_dict->SetWithoutPathExpansion("www.google.com:65536",
                                         server_pref_dict);
@@ skipping 24 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 128 matching lines @@
   ASSERT_EQ(0U, spdy_settings_map2_ret.size());
 
   Mock::VerifyAndClearExpectations(http_server_props_manager_.get());
 }
 
 TEST_F(HttpServerPropertiesManagerTest, GetAlternateProtocol) {
   ExpectPrefsUpdate();
 
   HostPortPair spdy_server_mail("mail.google.com", 80);
   EXPECT_FALSE(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.0);
 
   // Run the task.
   base::RunLoop().RunUntilIdle();
   Mock::VerifyAndClearExpectations(http_server_props_manager_.get());
 
-  const AlternateProtocolInfo alternate_protocol =
-      http_server_props_manager_->GetAlternateProtocol(spdy_server_mail);
-  EXPECT_EQ(443, alternate_protocol.port);
-  EXPECT_EQ(NPN_SPDY_3, alternate_protocol.protocol);
-  EXPECT_EQ(1.0, alternate_protocol.probability);
+  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();
 
   IPAddressNumber address;
   EXPECT_FALSE(http_server_props_manager_->GetSupportsQuic(&address));
 
   IPAddressNumber actual_address;
   CHECK(ParseIPLiteralToNumber("127.0.0.1", &actual_address));
@@ skipping 25 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.0);
   IPAddressNumber actual_address;
   CHECK(ParseIPLiteralToNumber("127.0.0.1", &actual_address));
   http_server_props_manager_->SetSupportsQuic(true, actual_address);
   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;
@@ skipping 52 matching lines @@
 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 the server preference for mail.google.com:80.
   servers_dict->SetWithoutPathExpansion("mail.google.com:80",
                                         server_pref_dict1);
@@ skipping 13 matching lines @@
   // Set up the pref.
   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);
-    AlternateProtocolInfo port_alternate_protocol =
-        http_server_props_manager_->GetAlternateProtocol(
+    AlternateProtocols alternate_protocols =
+        http_server_props_manager_->GetAlternateProtocols(
             HostPortPair::FromString(server));
-    EXPECT_EQ(i, port_alternate_protocol.port);
-    EXPECT_EQ(NPN_SPDY_3, port_alternate_protocol.protocol);
+    ASSERT_EQ(1u, alternate_protocols.size());
+    EXPECT_EQ(i, alternate_protocols[0].port);
+    EXPECT_EQ(NPN_SPDY_3, alternate_protocols[0].protocol);
   }
 
   // Verify SupportsQuic.
   IPAddressNumber address;
   ASSERT_TRUE(http_server_props_manager_->GetSupportsQuic(&address));
   EXPECT_EQ("127.0.0.1", IPAddressToString(address));
 }
 
 TEST_F(HttpServerPropertiesManagerTest, UpdateCacheWithPrefs) {
   const HostPortPair server_www("www.google.com", 80);
   const HostPortPair server_mail("mail.google.com", 80);
 
-  // Set alternate protocol.
-  http_server_props_manager_->SetAlternateProtocol(server_www, 443, NPN_SPDY_3,
+  // Set AltSvc.
+  http_server_props_manager_->AddAlternateProtocol(server_www, 443, NPN_SPDY_3,
                                                    1.0);
-  http_server_props_manager_->SetAlternateProtocol(server_mail, 444,
+  http_server_props_manager_->AddAlternateProtocol(server_www, 1234,
+                                                   NPN_SPDY_3_1, 0.7);
+  http_server_props_manager_->AddAlternateProtocol(server_mail, 444,
                                                    NPN_SPDY_3_1, 0.2);
 
   // Set ServerNetworkStats.
   ServerNetworkStats stats;
   stats.srtt = base::TimeDelta::FromInternalValue(42);
   http_server_props_manager_->SetServerNetworkStats(server_mail, stats);
 
   // Set SupportsQuic.
   IPAddressNumber actual_address;
   CHECK(ParseIPLiteralToNumber("127.0.0.1", &actual_address));
   http_server_props_manager_->SetSupportsQuic(true, actual_address);
 
   // Update cache.
   ExpectPrefsUpdate();
   ExpectCacheUpdate();
   http_server_props_manager_->ScheduleUpdateCacheOnPrefThread();
   base::RunLoop().RunUntilIdle();
 
   // Verify preferences.
-  const char expected_json[] = "{"
-    "\"servers\":{"
-      "\"mail.google.com:80\":{"
-        "\"alternate_protocol\":{"
-          "\"port\":444,\"probability\":0.2,\"protocol_str\":\"npn-spdy/3.1\""
-        "},"
-        "\"network_stats\":{"
-          "\"srtt\":42"
-        "}"
-      "},"
-      "\"www.google.com:80\":{"
-        "\"alternate_protocol\":{"
-          "\"port\":443,\"probability\":1.0,\"protocol_str\":\"npn-spdy/3\""
-        "}"
-      "}"
-    "},"
-    "\"supports_quic\":{"
-      "\"address\":\"127.0.0.1\",\"used_quic\":true"
-    "},"
-    "\"version\":3"
-  "}";
+  const char expected_json[] =
+      "{\"servers\":{\"mail.google.com:80\":{\"alternative_services\":[{"
+      "\"host\":\"mail.google.com\",\"port\":444,\"probability\":0.2,"
+      "\"protocol_str\":\"npn-spdy/3.1\"}],\"network_stats\":{\"srtt\":42}},"
+      "\"www.google.com:80\":{\"alternative_services\":[{\"host\":"
+      "\"www.google.com\",\"port\":443,\"probability\":1.0,\"protocol_str\":"
+      "\"npn-spdy/3\"},{\"host\":\"www.google.com\",\"port\":1234,"
+      "\"probability\":0.7,\"protocol_str\":\"npn-spdy/3.1\"}]}},"
+      "\"supports_quic\":{\"address\":\"127.0.0.1\",\"used_quic\":true},"
+      "\"version\":3}";
 
   const base::Value* http_server_properties =
       pref_service_.GetUserPref(kTestHttpServerProperties);
   ASSERT_NE(nullptr, http_server_properties);
   std::string preferences_json;
   EXPECT_TRUE(
       base::JSONWriter::Write(http_server_properties, &preferences_json));
   EXPECT_EQ(expected_json, preferences_json);
 }
 
@@ skipping 65 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