Change TaskManager test to be in line with new TabContents lifetime uncertainty when Prerendering.

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 bbea33c53abe01269e620115fe7612c2b8f01af8..1f3b3861712d02e20616f61d99d443b4935a8446 100644
--- a/chrome/browser/prerender/prerender_browsertest.cc
+++ b/chrome/browser/prerender/prerender_browsertest.cc
@@ -713,30 +713,41 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, TaskManager) {
   EXPECT_EQ(2, model()->ResourceCount());
   PrerenderTestURL("files/prerender/prerender_page.html", FINAL_STATUS_USED, 1);
 
-  // The prerender makes three.
-  EXPECT_EQ(3, model()->ResourceCount());
-
-  // It should have a TabContents associated with it.
-  ASSERT_TRUE(model()->GetResourceTabContents(1) != NULL);
-
-  // The prefix should be "Prerender:"
-  string16 prefix =
+  // The prerender makes three but we may have another Tab that we haven't
+  // deleted yet.
+  EXPECT_GE(model()->ResourceCount(), 3);

[mmenke, 2011/05/06 16:08:09]

Shouldn't we always have 4 here?  Browser, old (still in use), gpu, and the
prerender?

+  EXPECT_LE(model()->ResourceCount(), 4);
+
+  // One of the resources that has a TabContents associated with it should have
+  // the Prerender prefix.
+  const string16 prefix =
       l10n_util::GetStringFUTF16(IDS_TASK_MANAGER_PRERENDER_PREFIX,
                                  string16());
-  ASSERT_TRUE(StartsWith(model()->GetResourceTitle(2), prefix, true));
+  int num_prerender_tabs = 0;
+  for (int i = 0; i < model()->ResourceCount(); ++i) {
+    if (model()->GetResourceTabContents(i) &&
+        StartsWith(model()->GetResourceTitle(i), prefix, true)) {
+      ++num_prerender_tabs;
+    }
+  }
+  ASSERT_EQ(1, num_prerender_tabs);
 
   NavigateToDestURL();
 
-  // Prerender task should become a normal tab.
-  EXPECT_EQ(3, model()->ResourceCount());
-
-  // It should have a TabContents associated with it.
-  ASSERT_TRUE(model()->GetResourceTabContents(2) != NULL);
-
-  // The prefix should now be "Tab:"
-  prefix = l10n_util::GetStringFUTF16(IDS_TASK_MANAGER_TAB_PREFIX,
-                                      string16());
-  ASSERT_TRUE(StartsWith(model()->GetResourceTitle(2), prefix, true));
+  // Prerender task should become a normal tab but we still may not have deleted
+  // the old one.
+  EXPECT_GE(model()->ResourceCount(), 3);
+  EXPECT_LE(model()->ResourceCount(), 4);
+
+  // There should be no Tabs with the Prerender prefix.
+  num_prerender_tabs = 0;
+  for (int i = 0; i < model()->ResourceCount(); ++i) {
+    if (model()->GetResourceTabContents(i) &&
+        StartsWith(model()->GetResourceTitle(i), prefix, true)) {
+      ++num_prerender_tabs;
+    }
+  }
+  ASSERT_EQ(0, num_prerender_tabs);
 }
 
 // Checks that prerenderers will terminate when an audio tag is encountered.