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

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

Issue 5730004: Rename ExtensionsService to ExtensionService. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix typo Created 10 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
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"
11 #include "chrome/browser/browser_process.h" 11 #include "chrome/browser/browser_process.h"
12 #include "chrome/browser/extensions/crashed_extension_infobar.h" 12 #include "chrome/browser/extensions/crashed_extension_infobar.h"
13 #include "chrome/browser/extensions/extension_browsertest.h" 13 #include "chrome/browser/extensions/extension_browsertest.h"
14 #include "chrome/browser/extensions/extensions_service.h" 14 #include "chrome/browser/extensions/extension_service.h"
15 #include "chrome/browser/notifications/desktop_notification_service.h" 15 #include "chrome/browser/notifications/desktop_notification_service.h"
16 #include "chrome/browser/notifications/notification.h" 16 #include "chrome/browser/notifications/notification.h"
17 #include "chrome/browser/notifications/notification_test_util.h" 17 #include "chrome/browser/notifications/notification_test_util.h"
18 #include "chrome/browser/notifications/notification_ui_manager.h" 18 #include "chrome/browser/notifications/notification_ui_manager.h"
19 #include "chrome/browser/profiles/profile.h" 19 #include "chrome/browser/profiles/profile.h"
20 #include "chrome/browser/tab_contents/infobar_delegate.h" 20 #include "chrome/browser/tab_contents/infobar_delegate.h"
21 #include "chrome/browser/tab_contents/tab_contents.h" 21 #include "chrome/browser/tab_contents/tab_contents.h"
22 #include "chrome/browser/tabs/tab_strip_model.h" 22 #include "chrome/browser/tabs/tab_strip_model.h"
23 #include "chrome/browser/ui/browser.h" 23 #include "chrome/browser/ui/browser.h"
24 #include "chrome/browser/ui/browser_navigator.h" 24 #include "chrome/browser/ui/browser_navigator.h"
(...skipping 184 matching lines...) Expand 10 before | Expand all | Expand 10 after
209 WaitForResourceChange(2); 209 WaitForResourceChange(2);
210 } 210 }
211 211
212 IN_PROC_BROWSER_TEST_F(TaskManagerBrowserTest, NoticeAppTabs) { 212 IN_PROC_BROWSER_TEST_F(TaskManagerBrowserTest, NoticeAppTabs) {
213 // Show the task manager. This populates the model, and helps with debugging 213 // Show the task manager. This populates the model, and helps with debugging
214 // (you see the task manager). 214 // (you see the task manager).
215 browser()->window()->ShowTaskManager(); 215 browser()->window()->ShowTaskManager();
216 216
217 ASSERT_TRUE(LoadExtension( 217 ASSERT_TRUE(LoadExtension(
218 test_data_dir_.AppendASCII("packaged_app"))); 218 test_data_dir_.AppendASCII("packaged_app")));
219 ExtensionsService* service = browser()->profile()->GetExtensionsService(); 219 ExtensionService* service = browser()->profile()->GetExtensionService();
220 const Extension* extension = 220 const Extension* extension =
221 service->GetExtensionById(last_loaded_extension_id_, false); 221 service->GetExtensionById(last_loaded_extension_id_, false);
222 222
223 // Browser and the New Tab Page. 223 // Browser and the New Tab Page.
224 WaitForResourceChange(2); 224 WaitForResourceChange(2);
225 225
226 // Open a new tab to the app's launch URL and make sure we notice that. 226 // Open a new tab to the app's launch URL and make sure we notice that.
227 GURL url(extension->GetResourceURL("main.html")); 227 GURL url(extension->GetResourceURL("main.html"));
228 AddTabAtIndex(0, url, PageTransition::TYPED); 228 AddTabAtIndex(0, url, PageTransition::TYPED);
229 WaitForResourceChange(3); 229 WaitForResourceChange(3);
(...skipping 152 matching lines...) Expand 10 before | Expand all | Expand 10 after
382 WaitForResourceChange(3); 382 WaitForResourceChange(3);
383 383
384 // Check that we get some value for the cache columns. 384 // Check that we get some value for the cache columns.
385 DCHECK_NE(model()->GetResourceWebCoreImageCacheSize(2), 385 DCHECK_NE(model()->GetResourceWebCoreImageCacheSize(2),
386 l10n_util::GetStringUTF16(IDS_TASK_MANAGER_NA_CELL_TEXT)); 386 l10n_util::GetStringUTF16(IDS_TASK_MANAGER_NA_CELL_TEXT));
387 DCHECK_NE(model()->GetResourceWebCoreScriptsCacheSize(2), 387 DCHECK_NE(model()->GetResourceWebCoreScriptsCacheSize(2),
388 l10n_util::GetStringUTF16(IDS_TASK_MANAGER_NA_CELL_TEXT)); 388 l10n_util::GetStringUTF16(IDS_TASK_MANAGER_NA_CELL_TEXT));
389 DCHECK_NE(model()->GetResourceWebCoreCSSCacheSize(2), 389 DCHECK_NE(model()->GetResourceWebCoreCSSCacheSize(2),
390 l10n_util::GetStringUTF16(IDS_TASK_MANAGER_NA_CELL_TEXT)); 390 l10n_util::GetStringUTF16(IDS_TASK_MANAGER_NA_CELL_TEXT));
391 } 391 }
OLDNEW
« no previous file with comments | « chrome/browser/tabs/tab_strip_model.cc ('k') | chrome/browser/task_manager/task_manager_resource_providers.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698