Fix some problems with TaskManagerBrowserTest.PopulateWebCacheFields:

chrome/browser/task_manager_browsertest.cc

 // Copyright (c) 2010 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/task_manager.h"
 
 #include "app/l10n_util.h"
 #include "base/file_path.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/browser_window.h"
 #include "chrome/browser/extensions/crashed_extension_infobar.h"
 #include "chrome/browser/extensions/extension_browsertest.h"
 #include "chrome/browser/tab_contents/infobar_delegate.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/common/extensions/extension.h"
+#include "chrome/common/notification_type.h"
 #include "chrome/common/page_transition_types.h"
 #include "chrome/test/in_process_browser_test.h"
 #include "chrome/test/ui_test_utils.h"
 #include "grit/generated_resources.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {
 
 const FilePath::CharType* kTitle1File = FILE_PATH_LITERAL("title1.html");
 
@@ skipping 202 matching lines @@
   extension = model()->GetResourceExtension(2);
 
   ReloadExtension(extension->id());
   WaitForResourceChange(3);
   extension = model()->GetResourceExtension(2);
 
   ReloadExtension(extension->id());
   WaitForResourceChange(3);
 }
 
-// Crashy, http://crbug.com/42301.
-IN_PROC_BROWSER_TEST_F(TaskManagerBrowserTest,
-                       DISABLED_PopulateWebCacheFields) {
+IN_PROC_BROWSER_TEST_F(TaskManagerBrowserTest, PopulateWebCacheFields) {
   EXPECT_EQ(0, model()->ResourceCount());
 
   // Show the task manager. This populates the model, and helps with debugging
   // (you see the task manager).
   browser()->window()->ShowTaskManager();
 
   // Browser and the New Tab Page.
   EXPECT_EQ(2, model()->ResourceCount());
 
   // Open a new tab and make sure we notice that.
   GURL url(ui_test_utils::GetTestUrl(FilePath(FilePath::kCurrentDirectory),
                                      FilePath(kTitle1File)));
   browser()->AddTabWithURL(url, GURL(), PageTransition::TYPED, 0,
                            TabStripModel::ADD_SELECTED, NULL, std::string());
   WaitForResourceChange(3);
 
+  // Make sure that we have received updated stats from the renderer. An update
+  // could be pending before we added the new tab, so wait for two updates.
+  // This way at least one of them must have occurred after adding the tab.
+  ui_test_utils::WaitForNotification(
+      NotificationType::TASK_MANAGER_RESOURCE_TYPE_STATS_UPDATED);
+  ui_test_utils::WaitForNotification(
+      NotificationType::TASK_MANAGER_RESOURCE_TYPE_STATS_UPDATED);
+
   // Check that we get some value for the cache columns.
-  DCHECK_NE(model()->GetResourceWebCoreImageCacheSize(2),
+  EXPECT_NE(model()->GetResourceWebCoreImageCacheSize(2),
             l10n_util::GetString(IDS_TASK_MANAGER_NA_CELL_TEXT));
-  DCHECK_NE(model()->GetResourceWebCoreScriptsCacheSize(2),
+  EXPECT_NE(model()->GetResourceWebCoreScriptsCacheSize(2),
             l10n_util::GetString(IDS_TASK_MANAGER_NA_CELL_TEXT));
-  DCHECK_NE(model()->GetResourceWebCoreCSSCacheSize(2),
+  EXPECT_NE(model()->GetResourceWebCoreCSSCacheSize(2),
             l10n_util::GetString(IDS_TASK_MANAGER_NA_CELL_TEXT));
 }