Change multi-prerender API to include per launcher slots.

chrome/browser/prerender/prerender_browsertest.cc

Index: chrome/browser/prerender/prerender_browsertest.cc
diff --git a/chrome/browser/prerender/prerender_browsertest.cc b/chrome/browser/prerender/prerender_browsertest.cc
index a2d0f331ce5f100350519851731e680047bb0e71..f3aaf10c57e7d23f53dccb5d68bb03f33d1d460f 100644
--- a/chrome/browser/prerender/prerender_browsertest.cc
+++ b/chrome/browser/prerender/prerender_browsertest.cc
@@ -224,7 +224,6 @@ class TestPrerenderContents : public PrerenderContents {
         was_shown_(false),
         should_be_shown_(expected_final_status == FINAL_STATUS_USED),
         quit_message_loop_on_destruction_(
-            expected_final_status != FINAL_STATUS_EVICTED &&
             expected_final_status != FINAL_STATUS_APP_TERMINATING &&
             expected_final_status != FINAL_STATUS_MAX),
         expected_pending_prerenders_(0),
@@ -1236,6 +1235,9 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderPageRemovingLink) {
 
 IN_PROC_BROWSER_TEST_F(
     PrerenderBrowserTest, PrerenderPageRemovingLinkWithTwoLinks) {
+  GetPrerenderManager()->mutable_config().max_concurrency = 2;
+  GetPrerenderManager()->mutable_config().max_concurrency_per_launcher = 2;
+
   set_loader_path("files/prerender/prerender_loader_removing_links.html");
   set_loader_query_and_fragment("?links_to_insert=2&links_to_remove=2");
   PrerenderTestURL("files/prerender/prerender_page.html",
@@ -1265,6 +1267,8 @@ IN_PROC_BROWSER_TEST_F(
 IN_PROC_BROWSER_TEST_F(
     PrerenderBrowserTest,
     MAYBE_PrerenderPageRemovingLinkWithTwoLinksRemovingOne) {
+  GetPrerenderManager()->mutable_config().max_concurrency = 2;
+  GetPrerenderManager()->mutable_config().max_concurrency_per_launcher = 2;
   set_loader_path("files/prerender/prerender_loader_removing_links.html");
   set_loader_query_and_fragment("?links_to_insert=2&links_to_remove=1");
   PrerenderTestURL("files/prerender/prerender_page.html",
@@ -1741,6 +1745,7 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest,
   // This test is conceptually simplest if concurrency is at two, since we
   // don't have to worry about which of kHtmlFileB or kHtmlFileC gets evicted.
   GetPrerenderManager()->mutable_config().max_concurrency = 2;
+  GetPrerenderManager()->mutable_config().max_concurrency_per_launcher = 2;
 
   std::deque<FinalStatus> expected_final_status_queue;
   expected_final_status_queue.push_back(FINAL_STATUS_USED);