Implement multiple alternative services per origin.

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 144 matching lines @@
   void ExpectPrefsUpdateRepeatedly() {
     EXPECT_CALL(*http_server_props_manager_,
                 UpdatePrefsFromCacheOnNetworkThread(_))
         .WillRepeatedly(
             Invoke(http_server_props_manager_.get(),
                    &TestingHttpServerPropertiesManager::
                        UpdatePrefsFromCacheOnNetworkThreadConcrete));
   }
 
   bool HasAlternativeService(const HostPortPair& server) {
-    const AlternativeService alternative_service =
-        http_server_props_manager_->GetAlternativeService(server);
-    return alternative_service.protocol != UNINITIALIZED_ALTERNATE_PROTOCOL;
+    const AlternativeServiceVector alternative_service_vector =
+        http_server_props_manager_->GetAlternativeServices(server);
+    return !alternative_service_vector.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 alternative_service for www.google.com:80.
-  base::DictionaryValue* alternative_service_dict = new base::DictionaryValue;
-  alternative_service_dict->SetString("protocol_str", "npn-h2");
-  alternative_service_dict->SetString("host", "maps.google.com");
-  alternative_service_dict->SetInteger("port", 443);
+  // Set up alternative_services for www.google.com:80.
+  base::DictionaryValue* alternative_service_dict0 = new base::DictionaryValue;
+  alternative_service_dict0->SetInteger("port", 443);
+  alternative_service_dict0->SetString("protocol_str", "npn-spdy/3");
+  base::DictionaryValue* alternative_service_dict1 = new base::DictionaryValue;
+  alternative_service_dict1->SetInteger("port", 1234);
+  alternative_service_dict1->SetString("protocol_str", "quic");
   base::ListValue* alternative_service_list = new base::ListValue;
-  alternative_service_list->Append(alternative_service_dict);
+  alternative_service_list->Append(alternative_service_dict0);
+  alternative_service_list->Append(alternative_service_dict1);
   server_pref_dict->SetWithoutPathExpansion("alternative_service",
                                             alternative_service_list);
 
   // 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 to test migration to
-  // alternative-service.
+  // alternative_service.
   base::DictionaryValue* alternate_protocol_dict = new base::DictionaryValue;
   alternate_protocol_dict->SetString("protocol_str", "npn-spdy/3.1");
   alternate_protocol_dict->SetInteger("port", 444);
   server_pref_dict1->SetWithoutPathExpansion("alternate_protocol",
                                              alternate_protocol_dict);
 
   // 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);
@@ skipping 23 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 alternative service.
-  AlternativeService alternative_service =
-      http_server_props_manager_->GetAlternativeService(google_server);
-  EXPECT_EQ(NPN_SPDY_4, alternative_service.protocol);
-  EXPECT_EQ("maps.google.com", alternative_service.host);
-  EXPECT_EQ(443, alternative_service.port);
-  alternative_service =
-      http_server_props_manager_->GetAlternativeService(mail_server);
-  EXPECT_EQ(NPN_SPDY_3_1, alternative_service.protocol);
-  EXPECT_EQ("mail.google.com", alternative_service.host);
-  EXPECT_EQ(444, alternative_service.port);
+  const AlternativeServiceMap& map =
+      http_server_props_manager_->alternative_service_map();
+  ASSERT_EQ(2u, map.size());
+  AlternativeServiceMap::const_iterator map_it = map.begin();
+  EXPECT_EQ("www.google.com", map_it->first.host());
+  ASSERT_EQ(2u, map_it->second.size());
+  EXPECT_EQ(NPN_SPDY_3, map_it->second[0].alternative_service.protocol);
+  EXPECT_TRUE(map_it->second[0].alternative_service.host.empty());
+  EXPECT_EQ(443, map_it->second[0].alternative_service.port);
+  EXPECT_EQ(QUIC, map_it->second[1].alternative_service.protocol);
+  EXPECT_TRUE(map_it->second[1].alternative_service.host.empty());
+  EXPECT_EQ(1234, map_it->second[1].alternative_service.port);
+  ++map_it;
+  EXPECT_EQ("mail.google.com", map_it->first.host());
+  ASSERT_EQ(1u, map_it->second.size());
+  EXPECT_EQ(NPN_SPDY_3_1, map_it->second[0].alternative_service.protocol);
+  EXPECT_TRUE(map_it->second[0].alternative_service.host.empty());
+  EXPECT_EQ(444, map_it->second[0].alternative_service.port);
 
   // 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();
   ExpectScheduleUpdatePrefsOnNetworkThread();
 
   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 alternative_service for www.google.com:65536.
-
   base::DictionaryValue* alternative_service_dict = new base::DictionaryValue;
   alternative_service_dict->SetString("protocol_str", "npn-spdy/3");
   alternative_service_dict->SetInteger("port", 80);
   base::ListValue* alternative_service_list = new base::ListValue;
   alternative_service_list->Append(alternative_service_dict);
   server_pref_dict->SetWithoutPathExpansion("alternative_service",
                                             alternative_service_list);
 
   // Set up ServerNetworkStats for www.google.com:65536.
   base::DictionaryValue* stats = new base::DictionaryValue;
@@ skipping 189 matching lines @@
   base::RunLoop().RunUntilIdle();
 
   // Verify that there are no entries in the settings map.
   const SpdySettingsMap& spdy_settings_map2_ret =
       http_server_props_manager_->spdy_settings_map();
   ASSERT_EQ(0U, spdy_settings_map2_ret.size());
 
   Mock::VerifyAndClearExpectations(http_server_props_manager_.get());
 }
 
-TEST_F(HttpServerPropertiesManagerTest, GetAlternativeService) {
+TEST_F(HttpServerPropertiesManagerTest, GetAlternativeServices) {
+  ExpectPrefsUpdate();
+  ExpectScheduleUpdatePrefsOnNetworkThread();
+
+  HostPortPair spdy_server_mail("mail.google.com", 80);
+  EXPECT_FALSE(HasAlternativeService(spdy_server_mail));
+  const AlternativeService alternative_service(NPN_SPDY_4, "mail.google.com",
+                                               443);
+  http_server_props_manager_->AddAlternativeService(spdy_server_mail,
+                                                    alternative_service, 1.0);
+
+  // Run the task.
+  base::RunLoop().RunUntilIdle();
+  Mock::VerifyAndClearExpectations(http_server_props_manager_.get());
+
+  AlternativeServiceVector alternative_service_vector =
+      http_server_props_manager_->GetAlternativeServices(spdy_server_mail);
+  ASSERT_EQ(1u, alternative_service_vector.size());
+  EXPECT_EQ(alternative_service, alternative_service_vector[0]);
+}
+
+TEST_F(HttpServerPropertiesManagerTest, ClearAlternativeServices) {
   ExpectPrefsUpdate();
   ExpectScheduleUpdatePrefsOnNetworkThread();
 
   HostPortPair spdy_server_mail("mail.google.com", 80);
   EXPECT_FALSE(HasAlternativeService(spdy_server_mail));
   AlternativeService alternative_service(NPN_SPDY_4, "mail.google.com", 443);
-  http_server_props_manager_->SetAlternativeService(spdy_server_mail,
+  http_server_props_manager_->AddAlternativeService(spdy_server_mail,
                                                     alternative_service, 1.0);
+  ExpectScheduleUpdatePrefsOnNetworkThread();
+  http_server_props_manager_->ClearAlternativeServices(spdy_server_mail);
   // ExpectScheduleUpdatePrefsOnNetworkThread() should be called only once.
-  http_server_props_manager_->SetAlternativeService(spdy_server_mail,
-                                                    alternative_service, 1.0);
+  http_server_props_manager_->ClearAlternativeServices(spdy_server_mail);
 
   // Run the task.
   base::RunLoop().RunUntilIdle();
-  Mock::VerifyAndClearExpectations(http_server_props_manager_.get());
-
-  alternative_service =
-      http_server_props_manager_->GetAlternativeService(spdy_server_mail);
-  EXPECT_EQ(443, alternative_service.port);
-  EXPECT_EQ(NPN_SPDY_4, alternative_service.protocol);
-}
-
-TEST_F(HttpServerPropertiesManagerTest, ClearAlternativeService) {
-  ExpectPrefsUpdate();
-  ExpectScheduleUpdatePrefsOnNetworkThread();
-
-  HostPortPair spdy_server_mail("mail.google.com", 80);
-  EXPECT_FALSE(HasAlternativeService(spdy_server_mail));
-  AlternativeService alternative_service(NPN_SPDY_4, "mail.google.com", 443);
-  http_server_props_manager_->SetAlternativeService(spdy_server_mail,
-                                                    alternative_service, 1.0);
-  ExpectScheduleUpdatePrefsOnNetworkThread();
-  http_server_props_manager_->ClearAlternativeService(spdy_server_mail);
-  // ExpectScheduleUpdatePrefsOnNetworkThread() should be called only once.
-  http_server_props_manager_->ClearAlternativeService(spdy_server_mail);
-
-  // Run the task.
-  base::RunLoop().RunUntilIdle();
   Mock::VerifyAndClearExpectations(http_server_props_manager_.get());
 
   EXPECT_FALSE(HasAlternativeService(spdy_server_mail));
 }
 
 TEST_F(HttpServerPropertiesManagerTest, ConfirmAlternativeService) {
   ExpectPrefsUpdate();
 
   HostPortPair spdy_server_mail("mail.google.com", 80);
   EXPECT_FALSE(HasAlternativeService(spdy_server_mail));
   AlternativeService alternative_service(NPN_SPDY_4, "mail.google.com", 443);
 
   ExpectScheduleUpdatePrefsOnNetworkThread();
-  http_server_props_manager_->SetAlternativeService(spdy_server_mail,
+  http_server_props_manager_->AddAlternativeService(spdy_server_mail,
                                                     alternative_service, 1.0);
 
   EXPECT_FALSE(http_server_props_manager_->IsAlternativeServiceBroken(
       alternative_service));
   EXPECT_FALSE(http_server_props_manager_->WasAlternativeServiceRecentlyBroken(
       alternative_service));
 
   ExpectScheduleUpdatePrefsOnNetworkThread();
   http_server_props_manager_->MarkAlternativeServiceBroken(alternative_service);
   EXPECT_TRUE(http_server_props_manager_->IsAlternativeServiceBroken(
@@ skipping 68 matching lines @@
   EXPECT_EQ(10, stats2->srtt.ToInternalValue());
 }
 
 TEST_F(HttpServerPropertiesManagerTest, Clear) {
   ExpectPrefsUpdate();
   ExpectScheduleUpdatePrefsOnNetworkThreadRepeatedly();
 
   HostPortPair spdy_server_mail("mail.google.com", 443);
   http_server_props_manager_->SetSupportsSpdy(spdy_server_mail, true);
   AlternativeService alternative_service(NPN_SPDY_4, "mail.google.com", 443);
-  http_server_props_manager_->SetAlternativeService(spdy_server_mail,
+  http_server_props_manager_->AddAlternativeService(spdy_server_mail,
                                                     alternative_service, 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 51 matching lines @@
 // 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 alternative_service for www.google.com:i.
     base::DictionaryValue* alternative_service_dict = new base::DictionaryValue;
     alternative_service_dict->SetString("protocol_str", "npn-h2");
-    alternative_service_dict->SetString("host", "");
     alternative_service_dict->SetInteger("port", i);
     base::ListValue* alternative_service_list = new base::ListValue;
     alternative_service_list->Append(alternative_service_dict);
     base::DictionaryValue* server_pref_dict = new base::DictionaryValue;
     server_pref_dict->SetWithoutPathExpansion("alternative_service",
                                               alternative_service_list);
     servers_dict->SetWithoutPathExpansion(StringPrintf("www.google.com:%d", i),
                                           server_pref_dict);
   }
 
@@ skipping 19 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 alternative service.
   for (int i = 0; i < 200; ++i) {
     std::string server = StringPrintf("www.google.com:%d", i);
-    AlternativeService alternative_service =
-        http_server_props_manager_->GetAlternativeService(
+    AlternativeServiceVector alternative_service_vector =
+        http_server_props_manager_->GetAlternativeServices(
             HostPortPair::FromString(server));
-    EXPECT_EQ(i, alternative_service.port);
-    EXPECT_EQ(NPN_SPDY_4, alternative_service.protocol);
+    ASSERT_EQ(1u, alternative_service_vector.size());
+    EXPECT_EQ(NPN_SPDY_4, alternative_service_vector[0].protocol);
+    EXPECT_EQ(i, alternative_service_vector[0].port);
   }
 
   // Verify SupportsQuic.
   IPAddressNumber address;
   ASSERT_TRUE(http_server_props_manager_->GetSupportsQuic(&address));
   EXPECT_EQ("127.0.0.1", IPAddressToString(address));
 }
 
 TEST_F(HttpServerPropertiesManagerTest, UpdateCacheWithPrefs) {
   ExpectScheduleUpdatePrefsOnNetworkThreadRepeatedly();
 
   const HostPortPair server_www("www.google.com", 80);
   const HostPortPair server_mail("mail.google.com", 80);
 
   // Set alternate protocol.
-  AlternativeService www_altsvc(NPN_SPDY_4, "", 443);
-  AlternativeService mail_altsvc(NPN_SPDY_3_1, "mail.google.com", 444);
-  http_server_props_manager_->SetAlternativeService(server_www, www_altsvc,
-                                                    1.0);
-  http_server_props_manager_->SetAlternativeService(server_mail, mail_altsvc,
-                                                    0.2);
+  AlternativeService www_alternative_service1(NPN_SPDY_4, "", 443);
+  http_server_props_manager_->AddAlternativeService(
+      server_www, www_alternative_service1, 1.0);
+  AlternativeService www_alternative_service2(NPN_SPDY_4, "www.google.com",
+                                              1234);
+  http_server_props_manager_->AddAlternativeService(
+      server_www, www_alternative_service2, 0.7);
+  AlternativeService mail_alternative_service(NPN_SPDY_3_1, "foo.google.com",
+                                              444);
+  http_server_props_manager_->AddAlternativeService(
+      server_mail, mail_alternative_service, 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\":{\"alternative_service\":[{"
-      "\"host\":"
-      "\"mail.google.com\",\"port\":444,\"probability\":0.2,\"protocol_str\":"
-      "\"npn-spdy/"
-      "3.1\"}],\"network_stats\":{\"srtt\":42}},\"www.google.com:80\":"
-      "{\"alternative_service\":[{\"port\":443,\"probability\":1.0,"
+      "\"host\":\"foo.google.com\",\"port\":444,\"probability\":0.2,"
+      "\"protocol_str\":\"npn-spdy/3.1\"}],\"network_stats\":{\"srtt\":42}},"
+      "\"www.google.com:80\":{\"alternative_service\":[{\"port\":443,"
+      "\"probability\":1.0,\"protocol_str\":\"npn-h2\"},"
+      "{\"host\":\"www.google.com\",\"port\":1234,\"probability\":0.7,"
       "\"protocol_str\":\"npn-h2\"}]}},\"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 67 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