SHP 5: Adding a new version for disk data, migrating disk data to use scheme/host/port representati…

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/json/json_reader.h"
 #include "base/json/json_writer.h"
 #include "base/macros.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 125 matching lines @@
                     const base::Closure& completion));
 
  private:
   DISALLOW_COPY_AND_ASSIGN(TestingHttpServerPropertiesManager);
 };
 
 }  // namespace
 
 // TODO(rtenneti): After we stop supporting version 3 and everyone has migrated
 // to version 4, delete the following code.
-static const int kHttpServerPropertiesVersions[] = {3, 4};
+static const int kHttpServerPropertiesVersions[] = {3, 4, 5};
 
 class HttpServerPropertiesManagerTest : public testing::TestWithParam<int> {
  protected:
   HttpServerPropertiesManagerTest() {}
 
   void SetUp() override {
     one_day_from_now_ = base::Time::Now() + base::TimeDelta::FromDays(1);
     pref_delegate_ = new MockPrefDelegate;
     http_server_props_manager_.reset(
         new StrictMock<TestingHttpServerPropertiesManager>(
@@ skipping 69 matching lines @@
                         ::testing::ValuesIn(kHttpServerPropertiesVersions));
 
 TEST_P(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;
-  // TODO(zhongyi): change scheme to http once Pref data is also migrated
-  // SchemeHostPort.
-  url::SchemeHostPort google_server("https", "www.google.com", 80);
-  url::SchemeHostPort mail_server("https", "mail.google.com", 80);
+  url::SchemeHostPort google_server(GetParam() >= 5 ? "http" : "https",
+                                    "www.google.com", 80);
+  url::SchemeHostPort mail_server(GetParam() >= 5 ? "http" : "https",
+                                  "mail.google.com", 80);
 
-  // Set supports_spdy for www.google.com:80.
+  // Set supports_spdy for http://www.google.com:80.
   server_pref_dict->SetBoolean("supports_spdy", true);
 
-  // Set up alternative_services for www.google.com:80.
+  // Set up alternative_services for http://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-h2");
   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_list0 = new base::ListValue;
   alternative_service_list0->Append(alternative_service_dict0);
   alternative_service_list0->Append(alternative_service_dict1);
   server_pref_dict->SetWithoutPathExpansion("alternative_service",
                                             alternative_service_list0);
 
-  // Set up ServerNetworkStats for www.google.com:80.
+  // Set up ServerNetworkStats for http://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.
+  // Set the server preference for http://www.google.com:80.
   base::DictionaryValue* servers_dict = new base::DictionaryValue;
-  servers_dict->SetWithoutPathExpansion("www.google.com:80", server_pref_dict);
+  servers_dict->SetWithoutPathExpansion(
+      GetParam() >= 5 ? "http://www.google.com" : "www.google.com:80",
+      server_pref_dict);
   base::ListValue* servers_list = nullptr;
-  if (GetParam() == 4) {
+  if (GetParam() >= 4) {
     servers_list = new base::ListValue;
     // |servers_list| takes ownership of |servers_dict|.
     servers_list->AppendIfNotPresent(servers_dict);
     servers_dict = new base::DictionaryValue;
   }
 
   // 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 alternative_services for mail.google.com:80.
   base::DictionaryValue* alternative_service_dict2 = new base::DictionaryValue;
   alternative_service_dict2->SetString("protocol_str", "npn-spdy/3.1");
   alternative_service_dict2->SetInteger("port", 444);
   base::ListValue* alternative_service_list1 = new base::ListValue;
   alternative_service_list1->Append(alternative_service_dict2);
   server_pref_dict1->SetWithoutPathExpansion("alternative_service",
                                              alternative_service_list1);
 
-  // Set up ServerNetworkStats for mail.google.com:80 and it is the MRU server.
+  // Set up ServerNetworkStats for http://mail.google.com:80 and it is the MRU
+  // server.
   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);
+  // Set the server preference for http://mail.google.com:80.
+  servers_dict->SetWithoutPathExpansion(
+      GetParam() >= 5 ? "http://mail.google.com" : "mail.google.com:80",
+      server_pref_dict1);
   base::DictionaryValue http_server_properties_dict;
-  if (GetParam() == 4) {
+  if (GetParam() >= 4) {
     // |servers_list| takes ownership of |servers_dict|.
     servers_list->AppendIfNotPresent(servers_dict);
-    HttpServerPropertiesManager::SetVersion(&http_server_properties_dict, -1);
+    if (GetParam() == 5) {
+      HttpServerPropertiesManager::SetVersion(&http_server_properties_dict, -1);
+    } else {
+      HttpServerPropertiesManager::SetVersion(&http_server_properties_dict,
+                                              GetParam());
+    }
     http_server_properties_dict.SetWithoutPathExpansion("servers",
                                                         servers_list);
   } else {
     HttpServerPropertiesManager::SetVersion(&http_server_properties_dict,
                                             GetParam());
     http_server_properties_dict.SetWithoutPathExpansion("servers",
                                                         servers_dict);
   }
   base::DictionaryValue* supports_quic = new base::DictionaryValue;
   supports_quic->SetBoolean("used_quic", true);
@@ skipping 44 matching lines @@
       http_server_props_manager_->SupportsRequestPriority(google_server));
   EXPECT_TRUE(http_server_props_manager_->SupportsRequestPriority(mail_server));
   HostPortPair foo_host_port_pair =
       HostPortPair::FromString("foo.google.com:1337");
   url::SchemeHostPort foo_server("http", foo_host_port_pair.host(),
                                  foo_host_port_pair.port());
 
   EXPECT_FALSE(http_server_props_manager_->SupportsRequestPriority(foo_server));
 
   // Verify alternative service.
-  if (GetParam() == 4) {
+  if (GetParam() >= 4) {
     const AlternativeServiceMap& map =
         http_server_props_manager_->alternative_service_map();
     ASSERT_EQ(2u, map.size());
 
     AlternativeServiceMap::const_iterator map_it = map.begin();
     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);
@@ skipping 81 matching lines @@
   // 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);
   base::DictionaryValue http_server_properties_dict;
-  if (GetParam() == 4) {
+  if (GetParam() >= 4) {
     base::ListValue* servers_list = new base::ListValue;
     // |servers_list| takes ownership of |servers_dict|.
     servers_list->AppendIfNotPresent(servers_dict);
-    HttpServerPropertiesManager::SetVersion(&http_server_properties_dict, -1);
+    if (GetParam() == 5) {
+      HttpServerPropertiesManager::SetVersion(&http_server_properties_dict, -1);
+    } else {
+      HttpServerPropertiesManager::SetVersion(&http_server_properties_dict,
+                                              GetParam());
+    }
     http_server_properties_dict.SetWithoutPathExpansion("servers",
                                                         servers_list);
   } else {
     HttpServerPropertiesManager::SetVersion(&http_server_properties_dict,
                                             GetParam());
     http_server_properties_dict.SetWithoutPathExpansion("servers",
                                                         servers_dict);
   }
 
   // Set quic_server_info for www.google.com:65536.
@@ skipping 45 matching lines @@
   alternative_service_dict->SetInteger("port", 65536);
   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 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;
-  if (GetParam() == 4) {
+  if (GetParam() >= 4) {
     base::ListValue* servers_list = new base::ListValue;
     // |servers_list| takes ownership of |servers_dict|.
     servers_list->AppendIfNotPresent(servers_dict);
-    HttpServerPropertiesManager::SetVersion(&http_server_properties_dict, -1);
+    if (GetParam() == 5) {
+      HttpServerPropertiesManager::SetVersion(&http_server_properties_dict, -1);
+    } else {
+      HttpServerPropertiesManager::SetVersion(&http_server_properties_dict,
+                                              GetParam());
+    }
     http_server_properties_dict.SetWithoutPathExpansion("servers",
                                                         servers_list);
   } else {
     HttpServerPropertiesManager::SetVersion(&http_server_properties_dict,
                                             GetParam());
     http_server_properties_dict.SetWithoutPathExpansion("servers",
                                                         servers_dict);
   }
 
   // Set up the pref.
@@ skipping 410 matching lines @@
   Mock::VerifyAndClearExpectations(http_server_props_manager_.get());
 }
 
 // https://crbug.com/444956: Add 200 alternative_service servers followed by
 // supports_quic and verify we have read supports_quic from prefs.
 TEST_P(HttpServerPropertiesManagerTest, BadSupportsQuic) {
   ExpectCacheUpdate();
 
   base::DictionaryValue* servers_dict = new base::DictionaryValue;
   base::ListValue* servers_list = nullptr;
-  if (GetParam() == 4)
+  if (GetParam() >= 4)
     servers_list = new base::ListValue;
 
   for (int i = 1; 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", "quic");
     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);
-    if (GetParam() == 4) {
-      // TODO(zhongyi): add scheme once disc data is migrated.
+    if (GetParam() >= 5) {
+      servers_dict->SetWithoutPathExpansion(
+          StringPrintf("http://www.google.com:%d", i), server_pref_dict);
+    } else {
       servers_dict->SetWithoutPathExpansion(
           StringPrintf("www.google.com:%d", i), server_pref_dict);
+    }
+    if (GetParam() >= 4) {
       // |servers_list| takes ownership of |servers_dict|.
       servers_list->AppendIfNotPresent(servers_dict);
       servers_dict = new base::DictionaryValue;
-    } else {
-      // TODO(zhongyi): add scheme once disc data is migrated.
-      servers_dict->SetWithoutPathExpansion(
-          StringPrintf("www.google.com:%d", i), server_pref_dict);
     }
   }
 
-  // Set the preference for mail.google.com server.
+  // Set the server preference for http://mail.google.com server.
   base::DictionaryValue* server_pref_dict1 = new base::DictionaryValue;
-
-  // Set the server preference for mail.google.com:80.
-  // TODO(zhongyi): add scheme once disc data is migrated.
-  servers_dict->SetWithoutPathExpansion("mail.google.com:80",
-                                        server_pref_dict1);
+  if (GetParam() >= 5) {
+    servers_dict->SetWithoutPathExpansion("http://mail.google.com",
+                                          server_pref_dict1);
+  } else {
+    servers_dict->SetWithoutPathExpansion("mail.google.com:80",
+                                          server_pref_dict1);
+  }
   base::DictionaryValue http_server_properties_dict;
-  if (GetParam() == 4) {
+  if (GetParam() >= 4) {
     // |servers_list| takes ownership of |servers_dict|.
     servers_list->AppendIfNotPresent(servers_dict);
-    HttpServerPropertiesManager::SetVersion(&http_server_properties_dict, -1);
+    if (GetParam() == 5) {
+      HttpServerPropertiesManager::SetVersion(&http_server_properties_dict, -1);
+    } else {
+      HttpServerPropertiesManager::SetVersion(&http_server_properties_dict,
+                                              GetParam());
+    }
     http_server_properties_dict.SetWithoutPathExpansion("servers",
                                                         servers_list);
   } else {
     HttpServerPropertiesManager::SetVersion(&http_server_properties_dict,
                                             GetParam());
     http_server_properties_dict.SetWithoutPathExpansion("servers",
                                                         servers_dict);
   }
 
   // Set up SupportsQuic for 127.0.0.1
   base::DictionaryValue* supports_quic = new base::DictionaryValue;
   supports_quic->SetBoolean("used_quic", true);
   supports_quic->SetString("address", "127.0.0.1");
   http_server_properties_dict.SetWithoutPathExpansion("supports_quic",
                                                       supports_quic);
 
   // Set up the pref.
   pref_delegate_->SetPrefs(http_server_properties_dict);
 
   base::RunLoop().RunUntilIdle();
   Mock::VerifyAndClearExpectations(http_server_props_manager_.get());
 
   // Verify alternative service.
   for (int i = 1; i <= 200; ++i) {
-    // TODO(zhongyi): remove hardcoded scheme once disc data is migrated.
-    GURL server_gurl(StringPrintf("https://www.google.com:%d", i));
+    GURL server_gurl;
+    if (GetParam() >= 5) {
+      server_gurl = GURL(StringPrintf("http://www.google.com:%d", i));
+    } else {
+      server_gurl = GURL(StringPrintf("https://www.google.com:%d", i));
+    }
     url::SchemeHostPort server(server_gurl);
     AlternativeServiceVector alternative_service_vector =
         http_server_props_manager_->GetAlternativeServices(server);
     ASSERT_EQ(1u, alternative_service_vector.size());
     EXPECT_EQ(QUIC, alternative_service_vector[0].protocol);
     EXPECT_EQ(i, alternative_service_vector[0].port);
   }
 
   // Verify SupportsQuic.
   IPAddress address;
@@ skipping 48 matching lines @@
   ExpectPrefsUpdate();
   ExpectCacheUpdate();
   http_server_props_manager_->ScheduleUpdateCacheOnPrefThread();
   base::RunLoop().RunUntilIdle();
 
   // Verify preferences.
   const char expected_json[] =
       "{\"quic_servers\":{\"https://"
       "mail.google.com:80\":{\"server_info\":\"quic_server_info1\"}},"
       "\"servers\":["
-      "{\"www.google.com:80\":{"
+      "{\"http://www.google.com\":{"
       "\"alternative_service\":[{\"expiration\":\"13756212000000000\","
       "\"port\":443,\"protocol_str\":\"npn-h2\"},"
       "{\"expiration\":\"13758804000000000\",\"host\":\"www.google.com\","
       "\"port\":1234,\"protocol_str\":\"npn-h2\"}]}},"
-      "{\"mail.google.com:80\":{\"alternative_service\":[{"
+      "{\"http://mail.google.com\":{\"alternative_service\":[{"
       "\"expiration\":\"9223372036854775807\",\"host\":\"foo.google.com\","
       "\"port\":444,\"protocol_str\":\"npn-spdy/3.1\"}],"
       "\"network_stats\":{\"srtt\":42}}}"
       "],"
       "\"supports_quic\":{\"address\":\"127.0.0.1\",\"used_quic\":true},"
-      "\"version\":4}";
+      "\"version\":5}";
 
   const base::Value* http_server_properties =
       &pref_delegate_->GetServerProperties();
   std::string preferences_json;
   EXPECT_TRUE(
       base::JSONWriter::Write(*http_server_properties, &preferences_json));
   EXPECT_EQ(expected_json, preferences_json);
 }
 
 TEST_P(HttpServerPropertiesManagerTest, AddToAlternativeServiceMap) {
@@ skipping 86 matching lines @@
   const base::DictionaryValue& pref_dict =
       pref_delegate_->GetServerProperties();
 
   const base::ListValue* servers_list = nullptr;
   ASSERT_TRUE(pref_dict.GetListWithoutPathExpansion("servers", &servers_list));
   base::ListValue::const_iterator it = servers_list->begin();
   const base::DictionaryValue* server_pref_dict;
   ASSERT_TRUE((*it)->GetAsDictionary(&server_pref_dict));
 
   const base::DictionaryValue* example_pref_dict;
+
   ASSERT_TRUE(server_pref_dict->GetDictionaryWithoutPathExpansion(
-      "www.example.com:443", &example_pref_dict));
+      "https://www.example.com", &example_pref_dict));
 
   const base::ListValue* altsvc_list;
   ASSERT_TRUE(example_pref_dict->GetList("alternative_service", &altsvc_list));
 
   ASSERT_EQ(1u, altsvc_list->GetSize());
 
   const base::DictionaryValue* altsvc_entry;
   ASSERT_TRUE(altsvc_list->GetDictionary(0, &altsvc_entry));
 
   std::string hostname;
@@ skipping 111 matching lines @@
   // Shutdown comes before the task is executed.
   http_server_props_manager_->ShutdownOnPrefThread();
   // 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 net