Persist broken and recently-broken alt-svcs to prefs in HttpServerPropertiesManager

net/http/broken_alternative_services.cc

 // Copyright (c) 2017 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/broken_alternative_services.h"
 
 #include "base/memory/singleton.h"
 #include "base/time/tick_clock.h"
 #include "base/time/time.h"
 #include "net/http/http_server_properties_impl.h"
@@ skipping 96 matching lines @@
     broken_alternative_service_list_.erase(map_it->second);
     broken_alternative_service_map_.erase(map_it);
   }
 
   auto it = recently_broken_alternative_services_.Get(alternative_service);
   if (it != recently_broken_alternative_services_.end()) {
     recently_broken_alternative_services_.Erase(it);
   }
 }
 
-const BrokenAlternativeServiceList&
-BrokenAlternativeServices::broken_alternative_service_list() const {
-  return broken_alternative_service_list_;
-}
-
-const RecentlyBrokenAlternativeServices&
-BrokenAlternativeServices::recently_broken_alternative_services() const {
-  return recently_broken_alternative_services_;
-}
-
 void BrokenAlternativeServices::SetBrokenAndRecentlyBrokenAlternativeServices(
     std::unique_ptr<BrokenAlternativeServiceList>
         broken_alternative_service_list,
     std::unique_ptr<RecentlyBrokenAlternativeServices>
         recently_broken_alternative_services) {
   DCHECK(broken_alternative_service_list);
   DCHECK(recently_broken_alternative_services);
 
   // Make sure all alt svcs in |broken_alternative_service_list| has an entry
   // in |recently_broken_alternative_services|
@@ skipping 33 matching lines @@
     auto map_it = broken_alternative_service_map_.find(alternative_service);
     if (map_it != broken_alternative_service_map_.end()) {
       broken_alternative_service_list_.erase(map_it->second);
       map_it->second = it;
     } else {
       broken_alternative_service_map_.insert(
           std::make_pair(alternative_service, it));
     }
   }
 
-  // Merge |broken_alternative_service_list| with
-  // |broken_alternative_service_list_|. Both should already be sorted by
-  // expiration time. std::list::merge() will not invalidate any iterators
-  // of either list, so all iterators in |broken_alternative_service_map_|
-  // remain valid.
-  broken_alternative_service_list_.merge(
-      *broken_alternative_service_list,
+  // Append |broken_alternative_service_list| to
+  // |broken_alternative_service_list_|, then sort the resulting list.
+  // Neither operations will invalidate any iterators of either list,
+  // so all iterators in |broken_alternative_service_map_| remain valid.
+  broken_alternative_service_list_.splice(
+      broken_alternative_service_list_.end(), *broken_alternative_service_list);
+
+  broken_alternative_service_list_.sort(
       [](const std::pair<AlternativeService, base::TimeTicks>& lhs,
          const std::pair<AlternativeService, base::TimeTicks>& rhs) -> bool {
         return lhs.second < rhs.second;
       });
 
   base::TimeTicks new_next_expiration =
       broken_alternative_service_list_.empty()
           ? base::TimeTicks::Max()
           : broken_alternative_service_list_.front().second;
 
   if (new_next_expiration != next_expiration)
     ScheduleBrokenAlternateProtocolMappingsExpiration();
 }
 
+const BrokenAlternativeServiceList&
+BrokenAlternativeServices::broken_alternative_service_list() const {
+  return broken_alternative_service_list_;
+}
+
+const RecentlyBrokenAlternativeServices&
+BrokenAlternativeServices::recently_broken_alternative_services() const {
+  return recently_broken_alternative_services_;
+}
+
 bool BrokenAlternativeServices::AddToBrokenAlternativeServiceListAndMap(
     const AlternativeService& alternative_service,
     base::TimeTicks expiration,
     BrokenAlternativeServiceList::iterator* it) {
   DCHECK(it);
 
   auto map_it = broken_alternative_service_map_.find(alternative_service);
   if (map_it != broken_alternative_service_map_.end())
     return false;
 
@@ skipping 45 matching lines @@
   base::TimeDelta delay = when > now ? when - now : base::TimeDelta();
   expiration_timer_.Stop();
   expiration_timer_.Start(
       FROM_HERE, delay,
       base::Bind(
           &BrokenAlternativeServices ::ExpireBrokenAlternateProtocolMappings,
           weak_ptr_factory_.GetWeakPtr()));
 }
 
 }  // namespace net