SPDY Settings - preferences read from the disk maintain MRU order

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 76 matching lines @@
           canonical_host_to_origin_map_[canonical_host] = it->first;
           break;
         }
       }
     }
   }
 }
 
 void HttpServerPropertiesImpl::InitializeSpdySettingsServers(
     SpdySettingsMap* spdy_settings_map) {
+  // Add the entries from persisted data.
+  SpdySettingsMap new_spdy_settings_map(SpdySettingsMap::NO_AUTO_EVICT);
   for (SpdySettingsMap::reverse_iterator it = spdy_settings_map->rbegin();
        it != spdy_settings_map->rend(); ++it) {
-    spdy_settings_map_.Put(it->first, it->second);
+    new_spdy_settings_map.Put(it->first, it->second);
+  }
+
+  spdy_settings_map_.Swap(new_spdy_settings_map);
+
+  // Add the entries from the memory cache.
+  for (SpdySettingsMap::reverse_iterator it = new_spdy_settings_map.rbegin();
+       it != new_spdy_settings_map.rend(); ++it) {
+    if (spdy_settings_map_.Get(it->first) == spdy_settings_map_.end())
+      spdy_settings_map_.Put(it->first, it->second);
   }
 }
 
 void HttpServerPropertiesImpl::InitializeSupportsQuic(
     IPAddressNumber* last_address) {
   if (last_address)
     last_quic_address_ = *last_address;
 }
 
 void HttpServerPropertiesImpl::InitializeServerNetworkStats(
@@ skipping 608 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