TaskManagerBrowserTest.WebWorkerJSHeapMemory: update postMessage() usage.

chrome/browser/task_manager/task_manager_browsertest.cc

 // Copyright (c) 2012 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/task_manager.h"
 
 #include "base/files/file_path.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
@@ skipping 760 matching lines @@
   DCHECK_NE(model()->GetResourceWebCoreImageCacheSize(resource_count),
             l10n_util::GetStringUTF16(IDS_TASK_MANAGER_NA_CELL_TEXT));
   DCHECK_NE(model()->GetResourceWebCoreScriptsCacheSize(resource_count),
             l10n_util::GetStringUTF16(IDS_TASK_MANAGER_NA_CELL_TEXT));
   DCHECK_NE(model()->GetResourceWebCoreCSSCacheSize(resource_count),
             l10n_util::GetStringUTF16(IDS_TASK_MANAGER_NA_CELL_TEXT));
 }
 
 // Checks that task manager counts a worker thread JS heap size.
 // http://crbug.com/241066
-// Flaky, http://crbug.com/259368
-IN_PROC_BROWSER_TEST_F(TaskManagerBrowserTest, DISABLED_WebWorkerJSHeapMemory) {
+IN_PROC_BROWSER_TEST_F(TaskManagerBrowserTest, WebWorkerJSHeapMemory) {
+  ShowTaskManager();
   ui_test_utils::NavigateToURL(browser(), GetTestURL());
   const int extra_timeout_ms = 500;
   size_t minimal_heap_size = 2 * 1024 * 1024 * sizeof(void*);
   std::string test_js = base::StringPrintf(
       "var blob = new Blob([\n"
       "    'mem = new Array(%lu);',\n"
       "    'for (var i = 0; i < mem.length; i += 16) mem[i] = i;',\n"
-      "    'postMessage();']);\n"
+      "    'postMessage(i);']);\n"
       "blobURL = window.URL.createObjectURL(blob);\n"
       "worker = new Worker(blobURL);\n"
       "// Give the task manager few seconds to poll for JS heap sizes.\n"
       "worker.onmessage = setTimeout.bind(\n"
       "    this,\n"
       "    function () { window.domAutomationController.send(true); },\n"
       "    %d);\n"
-      "worker.postMessage();\n",
+      "worker.postMessage('go');\n",
       static_cast<unsigned long>(minimal_heap_size),
       GetUpdateTimeMs() + extra_timeout_ms);
   bool ok;
   ASSERT_TRUE(content::ExecuteScriptAndExtractBool(
       browser()->tab_strip_model()->GetActiveWebContents(), test_js, &ok));
   ASSERT_TRUE(ok);
 
-  int resource_index = TaskManager::GetInstance()->model()->ResourceCount() - 1;
+  ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(1, MatchTab("title1.html")));
+  ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(1, MatchAnyTab()));
+  int resource_index = FindResourceIndex(MatchTab("title1.html"));
   size_t result;
 
   ASSERT_TRUE(model()->GetV8Memory(resource_index, &result));
   LOG(INFO) << "Got V8 Heap Size " << result << " bytes";
   EXPECT_GE(result, minimal_heap_size);
 
   ASSERT_TRUE(model()->GetV8MemoryUsed(resource_index, &result));
   LOG(INFO) << "Got V8 Used Heap Size " << result << " bytes";
   EXPECT_GE(result, minimal_heap_size);
 }
@@ skipping 270 matching lines @@
   } else {
     ASSERT_NO_FATAL_FAILURE(
         WaitForTaskManagerRows(0, MatchSubframe("http://b.com/")));
     ASSERT_NO_FATAL_FAILURE(
         WaitForTaskManagerRows(1, MatchSubframe("http://c.com/")));
     ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(1, MatchAnySubframe()));
   }
   ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(1, MatchTab("aac")));
   ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(1, MatchAnyTab()));
 }