Update param types of HttpServerPropertiesImpl setters and getters. Fix MRU order when loading

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 <memory>
 #include <utility>
 
 #include "base/bind.h"
@@ skipping 389 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) {
-    const AlternativeServiceMap& map =
-        http_server_props_manager_->alternative_service_map();
-    ASSERT_EQ(2u, map.size());
+  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(kProtoHTTP2, 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);
-    ++map_it;
-    EXPECT_EQ("www.google.com", map_it->first.host());
-    ASSERT_EQ(2u, map_it->second.size());
-    EXPECT_EQ(kProtoHTTP2, 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(kProtoQUIC, 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);

[Zhongyi Shi, 2017/06/26 19:05:55]

Urm, old test indicated that the order has been changed from version 4+. Well,
good catch. 

-  } else {
-    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(kProtoHTTP2, 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(kProtoQUIC, 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(kProtoHTTP2, 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);
-  }
+  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(kProtoHTTP2, 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(kProtoQUIC, 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(kProtoHTTP2, 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.
   IPAddress last_address;
   EXPECT_TRUE(http_server_props_manager_->GetSupportsQuic(&last_address));
   EXPECT_EQ("127.0.0.1", last_address.ToString());
 
   // Verify ServerNetworkStats.
   const ServerNetworkStats* stats2 =
       http_server_props_manager_->GetServerNetworkStats(google_server);
   EXPECT_EQ(10, stats2->srtt.ToInternalValue());
@@ skipping 1105 matching lines @@
   pref_test_task_runner_->FastForwardUntilNoTasksRemain();
   EXPECT_FALSE(net_test_task_runner_->HasPendingTask());
   EXPECT_FALSE(pref_test_task_runner_->HasPendingTask());
   Mock::VerifyAndClearExpectations(http_server_props_manager_.get());
   http_server_props_manager_.reset();
   EXPECT_FALSE(net_test_task_runner_->HasPendingTask());
   EXPECT_FALSE(pref_test_task_runner_->HasPendingTask());
 }
 
 }  // namespace net