| OLD | NEW | 
|---|
| 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/browser.h" | 10 #include "chrome/browser/browser.h" | 
| (...skipping 152 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 163   Notification n1( | 163   Notification n1( | 
| 164       GURL(), GURL(content), ASCIIToUTF16("Test 1"), string16(), del1.get()); | 164       GURL(), GURL(content), ASCIIToUTF16("Test 1"), string16(), del1.get()); | 
| 165   scoped_refptr<NotificationDelegate> del2(new MockNotificationDelegate("n2")); | 165   scoped_refptr<NotificationDelegate> del2(new MockNotificationDelegate("n2")); | 
| 166   Notification n2( | 166   Notification n2( | 
| 167       GURL(), GURL(content), ASCIIToUTF16("Test 2"), string16(), del2.get()); | 167       GURL(), GURL(content), ASCIIToUTF16("Test 2"), string16(), del2.get()); | 
| 168 | 168 | 
| 169   notifications->Add(n1, browser()->profile()); | 169   notifications->Add(n1, browser()->profile()); | 
| 170   WaitForResourceChange(3); | 170   WaitForResourceChange(3); | 
| 171   notifications->Add(n2, browser()->profile()); | 171   notifications->Add(n2, browser()->profile()); | 
| 172   WaitForResourceChange(4); | 172   WaitForResourceChange(4); | 
| 173   notifications->Cancel(n1); | 173   notifications->CancelById(n1.notification_id()); | 
| 174   WaitForResourceChange(3); | 174   WaitForResourceChange(3); | 
| 175   notifications->Cancel(n2); | 175   notifications->CancelById(n2.notification_id()); | 
| 176   WaitForResourceChange(2); | 176   WaitForResourceChange(2); | 
| 177 } | 177 } | 
| 178 | 178 | 
| 179 // Times out on Vista; disabled to keep tests fast. http://crbug.com/44991 | 179 // Times out on Vista; disabled to keep tests fast. http://crbug.com/44991 | 
| 180 #if defined(OS_WIN) | 180 #if defined(OS_WIN) | 
| 181 #define KillExtension DISABLED_KillExtension | 181 #define KillExtension DISABLED_KillExtension | 
| 182 #endif | 182 #endif | 
| 183 IN_PROC_BROWSER_TEST_F(TaskManagerBrowserTest, KillExtension) { | 183 IN_PROC_BROWSER_TEST_F(TaskManagerBrowserTest, KillExtension) { | 
| 184   // Show the task manager. This populates the model, and helps with debugging | 184   // Show the task manager. This populates the model, and helps with debugging | 
| 185   // (you see the task manager). | 185   // (you see the task manager). | 
| (...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 291   WaitForResourceChange(3); | 291   WaitForResourceChange(3); | 
| 292 | 292 | 
| 293   // Check that we get some value for the cache columns. | 293   // Check that we get some value for the cache columns. | 
| 294   DCHECK_NE(model()->GetResourceWebCoreImageCacheSize(2), | 294   DCHECK_NE(model()->GetResourceWebCoreImageCacheSize(2), | 
| 295             l10n_util::GetStringUTF16(IDS_TASK_MANAGER_NA_CELL_TEXT)); | 295             l10n_util::GetStringUTF16(IDS_TASK_MANAGER_NA_CELL_TEXT)); | 
| 296   DCHECK_NE(model()->GetResourceWebCoreScriptsCacheSize(2), | 296   DCHECK_NE(model()->GetResourceWebCoreScriptsCacheSize(2), | 
| 297             l10n_util::GetStringUTF16(IDS_TASK_MANAGER_NA_CELL_TEXT)); | 297             l10n_util::GetStringUTF16(IDS_TASK_MANAGER_NA_CELL_TEXT)); | 
| 298   DCHECK_NE(model()->GetResourceWebCoreCSSCacheSize(2), | 298   DCHECK_NE(model()->GetResourceWebCoreCSSCacheSize(2), | 
| 299             l10n_util::GetStringUTF16(IDS_TASK_MANAGER_NA_CELL_TEXT)); | 299             l10n_util::GetStringUTF16(IDS_TASK_MANAGER_NA_CELL_TEXT)); | 
| 300 } | 300 } | 
| OLD | NEW | 
|---|