Changed uses of deque to vector in chrome/browser/android/data_usage.

chrome/browser/android/data_usage/tab_data_use_entry.cc

 // Copyright 2015 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 "chrome/browser/android/data_usage/tab_data_use_entry.h"
 
 #include "base/gtest_prod_util.h"
 #include "base/macros.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/strings/string_number_conversions.h"
@@ skipping 111 matching lines @@
   return false;
 }
 
 bool TabDataUseEntry::IsTrackingDataUse() const {
   TabSessions::const_reverse_iterator back_iterator = sessions_.rbegin();
   if (back_iterator == sessions_.rend())
     return false;
   return back_iterator->end_time.is_null();
 }
 
-const base::TimeTicks TabDataUseEntry::GetLatestStartOrEndTime() const {
+base::TimeTicks TabDataUseEntry::GetLatestStartOrEndTime() const {
   TabSessions::const_reverse_iterator back_iterator = sessions_.rbegin();
   if (back_iterator == sessions_.rend())
     return base::TimeTicks();  // No tab session found.
   if (!back_iterator->end_time.is_null())
     return back_iterator->end_time;
 
   DCHECK(!back_iterator->start_time.is_null());
   return back_iterator->start_time;
 }
 
-const std::string TabDataUseEntry::GetActiveTrackingSessionLabel() const {
+std::string TabDataUseEntry::GetActiveTrackingSessionLabel() const {
   TabSessions::const_reverse_iterator back_iterator = sessions_.rbegin();
   if (back_iterator == sessions_.rend() || !IsTrackingDataUse())
     return std::string();
   return back_iterator->label;
 }
 
 void TabDataUseEntry::set_custom_tab_package_match(
     bool is_custom_tab_package_match) {
   DCHECK(IsTrackingDataUse());
   DCHECK(!GetActiveTrackingSessionLabel().empty());
   is_custom_tab_package_match_ = is_custom_tab_package_match;
 }
 
 void TabDataUseEntry::CompactSessionHistory() {
-  while (sessions_.size() > tab_model_->max_sessions_per_tab()) {
-    const auto& front = sessions_.front();
-    DCHECK(!front.end_time.is_null());
+  if (sessions_.size() <= tab_model_->max_sessions_per_tab())
+    return;
+
+  const auto end_it = sessions_.begin() +
+                      (sessions_.size() - tab_model_->max_sessions_per_tab());
+
+  for (auto it = sessions_.begin(); it != end_it; ++it) {
+    DCHECK(!it->end_time.is_null());
     // Track how often old sessions are lost.
     UMA_HISTOGRAM_CUSTOM_TIMES(kUMAOldInactiveSessionRemovalDurationHistogram,
-                               tab_model_->NowTicks() - front.end_time,
+                               tab_model_->NowTicks() - it->end_time,
                                base::TimeDelta::FromSeconds(1),
                                base::TimeDelta::FromHours(1), 50);
-    sessions_.pop_front();
   }
+
+  sessions_.erase(sessions_.begin(), end_it);
 }
 
 }  // namespace android
 
 }  // namespace chrome