Make three simultanious prerenders the default maximum in Canary and Dev only.

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 b941c1dda1a7e6e89a4a2155971e382646f85913..f368ba56b5a3d93aabb50f43c9e9093203ee80c2 100644
--- a/chrome/browser/prerender/prerender_browsertest.cc
+++ b/chrome/browser/prerender/prerender_browsertest.cc
@@ -233,8 +233,8 @@ class TestPrerenderContents : public PrerenderContents {
   virtual void AddPendingPrerender(
       base::WeakPtr<PrerenderHandle> weak_prerender_handle,
       const GURL& url,
-                                   const content::Referrer& referrer,
-                                   const gfx::Size& size) OVERRIDE {
+      const content::Referrer& referrer,

[gavinp, 2012/07/19 11:06:54]

... (ooops)

+      const gfx::Size& size) OVERRIDE {
     PrerenderContents::AddPendingPrerender(
         weak_prerender_handle, url, referrer, size);
     if (expected_pending_prerenders_ > 0 &&
@@ -1529,7 +1529,7 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderInfiniteLoopMultiple) {
   // be evicted, and the second should stick around until we exit.

[dominich, 2012/07/19 16:04:38]

update comment.

[gavinp, 2012/07/23 18:35:21]

Done.

   std::deque<FinalStatus> expected_final_status_queue;
   expected_final_status_queue.push_back(FINAL_STATUS_USED);
-  expected_final_status_queue.push_back(FINAL_STATUS_EVICTED);
+  expected_final_status_queue.push_back(FINAL_STATUS_APP_TERMINATING);
   expected_final_status_queue.push_back(FINAL_STATUS_APP_TERMINATING);
 
   PrerenderTestURL(kHtmlFileA, expected_final_status_queue, 1);
@@ -1549,8 +1549,7 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderInfiniteLoopMultiple) {
   // active entry.
   bool url_b_is_active_prerender = UrlIsInPrerenderManager(kHtmlFileB);
   bool url_c_is_active_prerender = UrlIsInPrerenderManager(kHtmlFileC);
-  EXPECT_TRUE((url_b_is_active_prerender || url_c_is_active_prerender) &&
-              !(url_b_is_active_prerender && url_c_is_active_prerender));
+  EXPECT_TRUE(url_b_is_active_prerender && url_c_is_active_prerender);

[gavinp, 2012/07/19 11:06:54]

Of course, now this test depends on concurrency >= 2.

[dominich, 2012/07/19 16:04:38]

Which is accurate. If you want to be very careful, add an
ASSERT_GT(prerender_manager_concurrent_prerender(), 1);

[gavinp, 2012/07/23 18:35:21]

Since in another review comment, you asked me to make the default 1, instead I
made this test default to 2. So that acts similarly to an assertion, the setting
of concurrency.

   EXPECT_FALSE(UrlIsPending(kHtmlFileB));
   EXPECT_FALSE(UrlIsPending(kHtmlFileC));
 }