Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(746)

Side by Side Diff: chrome/browser/task_manager/task_manager_browsertest.cc

Issue 6155002: Revert 70722 - Disable crashy TaskManagerBrowserTest.ReloadExtension... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/task_manager/task_manager.h" 5 #include "chrome/browser/task_manager/task_manager.h"
6 6
7 #include "app/l10n_util.h" 7 #include "app/l10n_util.h"
8 #include "base/file_path.h" 8 #include "base/file_path.h"
9 #include "base/utf_string_conversions.h" 9 #include "base/utf_string_conversions.h"
10 #include "chrome/browser/background_contents_service.h" 10 #include "chrome/browser/background_contents_service.h"
(...skipping 317 matching lines...) Expand 10 before | Expand all | Expand 10 after
328 delegate->AsCrashedExtensionInfoBarDelegate(); 328 delegate->AsCrashedExtensionInfoBarDelegate();
329 ASSERT_TRUE(crashed_delegate); 329 ASSERT_TRUE(crashed_delegate);
330 crashed_delegate->Accept(); 330 crashed_delegate->Accept();
331 WaitForResourceChange(3); 331 WaitForResourceChange(3);
332 } 332 }
333 333
334 // Regression test for http://crbug.com/18693. 334 // Regression test for http://crbug.com/18693.
335 // 335 //
336 // This test has been crashy in the past, and is re-enabled temporarily to 336 // This test has been crashy in the past, and is re-enabled temporarily to
337 // gather more diagnostic information. See http://crbug.com/42315. 337 // gather more diagnostic information. See http://crbug.com/42315.
338 // Crashy, http://crbug.com/66957. 338 IN_PROC_BROWSER_TEST_F(TaskManagerBrowserTest, ReloadExtension) {
339 IN_PROC_BROWSER_TEST_F(TaskManagerBrowserTest, DISABLED_ReloadExtension) {
340 // Show the task manager. This populates the model, and helps with debugging 339 // Show the task manager. This populates the model, and helps with debugging
341 // (you see the task manager). 340 // (you see the task manager).
342 browser()->window()->ShowTaskManager(); 341 browser()->window()->ShowTaskManager();
343 342
344 LOG(INFO) << "loading extension"; 343 LOG(INFO) << "loading extension";
345 ASSERT_TRUE(LoadExtension( 344 ASSERT_TRUE(LoadExtension(
346 test_data_dir_.AppendASCII("common").AppendASCII("background_page"))); 345 test_data_dir_.AppendASCII("common").AppendASCII("background_page")));
347 346
348 // Wait until we see the loaded extension in the task manager (the three 347 // Wait until we see the loaded extension in the task manager (the three
349 // resources are: the browser process, New Tab Page, and the extension). 348 // resources are: the browser process, New Tab Page, and the extension).
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
395 WaitForResourceChange(3); 394 WaitForResourceChange(3);
396 395
397 // Check that we get some value for the cache columns. 396 // Check that we get some value for the cache columns.
398 DCHECK_NE(model()->GetResourceWebCoreImageCacheSize(2), 397 DCHECK_NE(model()->GetResourceWebCoreImageCacheSize(2),
399 l10n_util::GetStringUTF16(IDS_TASK_MANAGER_NA_CELL_TEXT)); 398 l10n_util::GetStringUTF16(IDS_TASK_MANAGER_NA_CELL_TEXT));
400 DCHECK_NE(model()->GetResourceWebCoreScriptsCacheSize(2), 399 DCHECK_NE(model()->GetResourceWebCoreScriptsCacheSize(2),
401 l10n_util::GetStringUTF16(IDS_TASK_MANAGER_NA_CELL_TEXT)); 400 l10n_util::GetStringUTF16(IDS_TASK_MANAGER_NA_CELL_TEXT));
402 DCHECK_NE(model()->GetResourceWebCoreCSSCacheSize(2), 401 DCHECK_NE(model()->GetResourceWebCoreCSSCacheSize(2),
403 l10n_util::GetStringUTF16(IDS_TASK_MANAGER_NA_CELL_TEXT)); 402 l10n_util::GetStringUTF16(IDS_TASK_MANAGER_NA_CELL_TEXT));
404 } 403 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698