Change multi-prerender API to include per launcher slots.

chrome/browser/prerender/prerender_manager.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 "chrome/browser/prerender/prerender_manager.h"
 
 #include <algorithm>
 #include <functional>
 #include <string>
 #include <vector>
@@ skipping 81 matching lines @@
 // have in the control group.  If that dummy prerender in the prerender group
 // would then be swapped in (but isn't actually b/c it's a dummy), we record
 // this as a MatchComplete.  This allows us to compare MatchComplete's
 // across Prerender & Control group which ideally should be lining up.
 // This ensures that there is no bias in terms of the page load times
 // of the pages forming the difference between the two sets.
 
 bool NeedMatchCompleteDummyForFinalStatus(FinalStatus final_status) {
   return final_status != FINAL_STATUS_USED &&
       final_status != FINAL_STATUS_TIMED_OUT &&
-      final_status != FINAL_STATUS_EVICTED &&
       final_status != FINAL_STATUS_MANAGER_SHUTDOWN &&
       final_status != FINAL_STATUS_APP_TERMINATING &&
       final_status != FINAL_STATUS_WINDOW_OPENER &&
       final_status != FINAL_STATUS_CACHE_OR_HISTORY_CLEARED &&
       final_status != FINAL_STATUS_CANCELLED &&
       final_status != FINAL_STATUS_DEVTOOLS_ATTACHED &&
       final_status != FINAL_STATUS_CROSS_SITE_NAVIGATION_PENDING;
 }
 
 }  // namespace
@@ skipping 89 matching lines @@
   // Any other checks simply make sure that the PrerenderManager is accessed on
   // the same thread that it was created on.
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   if (IsLocalPredictorEnabled())
     local_predictor_.reset(new PrerenderLocalPredictor(this));
 
   // Certain experiments override our default config_ values.
   switch (PrerenderManager::GetMode()) {
     case PrerenderManager::PRERENDER_MODE_EXPERIMENT_MULTI_PRERENDER_GROUP:
-      config_.max_concurrency = 3;
+      config_.max_concurrency = 4;
+      config_.max_concurrency_per_launcher = 2;
       break;
     case PrerenderManager::PRERENDER_MODE_EXPERIMENT_15MIN_TTL_GROUP:
       config_.time_to_live = base::TimeDelta::FromMinutes(15);
       break;
     default:
       break;
   }
 }
 
 PrerenderManager::~PrerenderManager() {
@@ skipping 816 matching lines @@
 
   gfx::Size contents_size =
       size.IsEmpty() ? config_.default_tab_bounds.size() : size;
 
   prerender_contents->StartPrerendering(process_id, contents_size,
                                         session_storage_namespace);
 
   DCHECK(IsControlGroup(experiment) ||
          prerender_contents->prerendering_has_started());
 
-  while (active_prerenders_.size() > config_.max_concurrency) {
-    prerender_contents = active_prerenders_.front()->contents();
-    DCHECK(prerender_contents);
-    prerender_contents->Destroy(FINAL_STATUS_EVICTED);
-  }
-
   histograms_->RecordConcurrency(active_prerenders_.size(),
                                  config_.max_concurrency);
 
   StartSchedulingPeriodicCleanups();
   return prerender_handle;
 }
 
 void PrerenderManager::StartSchedulingPeriodicCleanups() {
   DCHECK(CalledOnValidThread());
   if (repeating_timer_.IsRunning())
@@ skipping 127 matching lines @@
   return active_prerenders_.end();
 }
 
 bool PrerenderManager::DoesRateLimitAllowPrerender(Origin origin) const {
   DCHECK(CalledOnValidThread());
   base::TimeDelta elapsed_time =
       GetCurrentTimeTicks() - last_prerender_start_time_;
   histograms_->RecordTimeBetweenPrerenderRequests(origin, elapsed_time);
   if (!config_.rate_limit_enabled)
     return true;
-  return elapsed_time >
+  return elapsed_time >=
       base::TimeDelta::FromMilliseconds(kMinTimeBetweenPrerendersMs);
 }
 
 void PrerenderManager::DeleteOldWebContents() {
   while (!old_web_contents_list_.empty()) {
     WebContents* web_contents = old_web_contents_list_.front();
     old_web_contents_list_.pop_front();
     // TODO(dominich): should we use Instant Unload Handler here?
     delete web_contents;
   }
@@ skipping 103 matching lines @@
   if (!render_process_host || !render_process_host->GetBrowserContext())
     return NULL;
   Profile* profile = Profile::FromBrowserContext(
       render_process_host->GetBrowserContext());
   if (!profile)
     return NULL;
   return PrerenderManagerFactory::GetInstance()->GetForProfile(profile);
 }
 
 }  // namespace prerender