Changes to QuicServerInfoMap initialization to maintain MRU order of the

net/http/http_server_properties_impl.cc

 // Copyright (c) 2012 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_impl.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/location.h"
@@ skipping 99 matching lines @@
     ServerNetworkStatsMap* server_network_stats_map) {
   for (ServerNetworkStatsMap::reverse_iterator it =
            server_network_stats_map->rbegin();
        it != server_network_stats_map->rend(); ++it) {
     server_network_stats_map_.Put(it->first, it->second);
   }
 }
 
 void HttpServerPropertiesImpl::InitializeQuicServerInfoMap(
     QuicServerInfoMap* quic_server_info_map) {
-  for (const std::pair<QuicServerId, std::string>& entry :
-       *quic_server_info_map) {
-    quic_server_info_map_.Put(entry.first, entry.second);
+  // Add the entries from persisted data.
+  QuicServerInfoMap temp_map(kMaxQuicServersToPersist);
+  for (QuicServerInfoMap::reverse_iterator it = quic_server_info_map->rbegin();
+       it != quic_server_info_map->rend(); ++it) {
+    temp_map.Put(it->first, it->second);
+  }
+
+  quic_server_info_map_.Swap(temp_map);
+
+  // Add the entries from the memory cache.
+  for (QuicServerInfoMap::reverse_iterator it = temp_map.rbegin();
+       it != temp_map.rend(); ++it) {
+    if (quic_server_info_map_.Get(it->first) == quic_server_info_map_.end()) {
+      quic_server_info_map_.Put(it->first, it->second);
+    }
   }
 }
 
 void HttpServerPropertiesImpl::GetSpdyServerList(
     base::ListValue* spdy_server_list,
     size_t max_size) const {
   DCHECK(CalledOnValidThread());
   DCHECK(spdy_server_list);
   spdy_server_list->Clear();
   size_t count = 0;
@@ skipping 585 matching lines @@
   base::TimeDelta delay = when > now ? when - now : base::TimeDelta();
   base::ThreadTaskRunnerHandle::Get()->PostDelayedTask(
       FROM_HERE,
       base::Bind(
           &HttpServerPropertiesImpl::ExpireBrokenAlternateProtocolMappings,
           weak_ptr_factory_.GetWeakPtr()),
       delay);
 }
 
 }  // namespace net