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

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

Issue 11412286: Disable TaskManagerBrowserTest tests on Win Aura for now since they're flaking. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 8 years 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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "base/file_path.h" 7 #include "base/file_path.h"
8 #include "base/stringprintf.h" 8 #include "base/stringprintf.h"
9 #include "base/utf_string_conversions.h" 9 #include "base/utf_string_conversions.h"
10 #include "chrome/browser/api/infobars/confirm_infobar_delegate.h" 10 #include "chrome/browser/api/infobars/confirm_infobar_delegate.h"
(...skipping 25 matching lines...) Expand all
36 #include "chrome/test/base/in_process_browser_test.h" 36 #include "chrome/test/base/in_process_browser_test.h"
37 #include "chrome/test/base/ui_test_utils.h" 37 #include "chrome/test/base/ui_test_utils.h"
38 #include "content/public/browser/notification_service.h" 38 #include "content/public/browser/notification_service.h"
39 #include "content/public/common/content_switches.h" 39 #include "content/public/common/content_switches.h"
40 #include "content/public/common/page_transition_types.h" 40 #include "content/public/common/page_transition_types.h"
41 #include "grit/generated_resources.h" 41 #include "grit/generated_resources.h"
42 #include "net/base/mock_host_resolver.h" 42 #include "net/base/mock_host_resolver.h"
43 #include "testing/gtest/include/gtest/gtest.h" 43 #include "testing/gtest/include/gtest/gtest.h"
44 #include "ui/base/l10n/l10n_util.h" 44 #include "ui/base/l10n/l10n_util.h"
45 45
46 // http://crbug.com/31663
47 #if !(defined(OS_WIN) && defined(USE_AURA))
48
46 using content::WebContents; 49 using content::WebContents;
47 50
48 // On Linux this is crashing intermittently http://crbug/84719 51 // On Linux this is crashing intermittently http://crbug/84719
49 // In some environments this test fails about 1/6 http://crbug/84850 52 // In some environments this test fails about 1/6 http://crbug/84850
50 #if defined(OS_LINUX) 53 #if defined(OS_LINUX)
51 #define MAYBE_KillExtension DISABLED_KillExtension 54 #define MAYBE_KillExtension DISABLED_KillExtension
52 #else 55 #else
53 #define MAYBE_KillExtension KillExtension 56 #define MAYBE_KillExtension KillExtension
54 #endif 57 #endif
55 58
(...skipping 546 matching lines...) Expand 10 before | Expand all | Expand 10 after
602 TaskManagerBrowserTestUtil::WaitForWebResourceChange(2); 605 TaskManagerBrowserTestUtil::WaitForWebResourceChange(2);
603 606
604 // Check that we get some value for the cache columns. 607 // Check that we get some value for the cache columns.
605 DCHECK_NE(model()->GetResourceWebCoreImageCacheSize(resource_count), 608 DCHECK_NE(model()->GetResourceWebCoreImageCacheSize(resource_count),
606 l10n_util::GetStringUTF16(IDS_TASK_MANAGER_NA_CELL_TEXT)); 609 l10n_util::GetStringUTF16(IDS_TASK_MANAGER_NA_CELL_TEXT));
607 DCHECK_NE(model()->GetResourceWebCoreScriptsCacheSize(resource_count), 610 DCHECK_NE(model()->GetResourceWebCoreScriptsCacheSize(resource_count),
608 l10n_util::GetStringUTF16(IDS_TASK_MANAGER_NA_CELL_TEXT)); 611 l10n_util::GetStringUTF16(IDS_TASK_MANAGER_NA_CELL_TEXT));
609 DCHECK_NE(model()->GetResourceWebCoreCSSCacheSize(resource_count), 612 DCHECK_NE(model()->GetResourceWebCoreCSSCacheSize(resource_count),
610 l10n_util::GetStringUTF16(IDS_TASK_MANAGER_NA_CELL_TEXT)); 613 l10n_util::GetStringUTF16(IDS_TASK_MANAGER_NA_CELL_TEXT));
611 } 614 }
615
616 #endif
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