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

chrome/browser/prerender/prerender_browsertest.cc

 // Copyright (c) 2011 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 <deque>
 
 #include "base/command_line.h"
 #include "base/path_service.h"
 #include "base/string_util.h"
 #include "chrome/browser/prerender/prerender_contents.h"
@@ skipping 695 matching lines @@
     return;
   }
 
   // Show the task manager. This populates the model.
   browser()->window()->ShowTaskManager();
 
   // Start with two resources.
   EXPECT_EQ(2, model()->ResourceCount());
   PrerenderTestURL("files/prerender/prerender_page.html", FINAL_STATUS_USED, 1);
 
-  // The prerender makes three.
-  EXPECT_EQ(3, model()->ResourceCount());
+  // 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);
 
-  // It should have a TabContents associated with it.
-  ASSERT_TRUE(model()->GetResourceTabContents(1) != NULL);
-
-  // The prefix should be "Prerender:"
-  string16 prefix =
+  // 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());
+  // 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);
 
-  // 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));
+  // 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.
 IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderHTML5Audio) {
   PrerenderTestURL("files/prerender/prerender_html5_audio.html",
                    FINAL_STATUS_HTML5_MEDIA,
                    1);
 }
 
 // Checks that prerenderers will terminate when a video tag is encountered.
@@ skipping 168 matching lines @@
   std::string replacement_path;
   ASSERT_TRUE(net::TestServer::GetFilePathWithReplacements(
       "files/prerender/prerender_with_image.html",
       replacement_text,
       &replacement_path));
   PrerenderTestURL(replacement_path, FINAL_STATUS_USED, 1);
   NavigateToDestURL();
 }
 
 }  // namespace prerender