diff options
author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-19 23:17:07 +0000 |
---|---|---|
committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-19 23:17:07 +0000 |
commit | ad50def5e1165d0cc74b98f988bbd5962587d9f4 (patch) | |
tree | 3a751abaed2cc056ca60b8b1e3ff54532a6f4d3f /chrome/browser/oom_priority_manager_browsertest.cc | |
parent | 75c920505ddfb2d49c194c76bde64edd6b3f91f2 (diff) | |
download | chromium_src-ad50def5e1165d0cc74b98f988bbd5962587d9f4.zip chromium_src-ad50def5e1165d0cc74b98f988bbd5962587d9f4.tar.gz chromium_src-ad50def5e1165d0cc74b98f988bbd5962587d9f4.tar.bz2 |
Make NotificationService an interface in the content namespace, and switch callers to use it. Move the implementation to content/browser. Stop creating it in all child processes since it's only used in the browser.
BUG=98716
Review URL: http://codereview.chromium.org/8342048
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@106403 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/oom_priority_manager_browsertest.cc')
-rw-r--r-- | chrome/browser/oom_priority_manager_browsertest.cc | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/chrome/browser/oom_priority_manager_browsertest.cc b/chrome/browser/oom_priority_manager_browsertest.cc index 6cb3a74..04e6f1d 100644 --- a/chrome/browser/oom_priority_manager_browsertest.cc +++ b/chrome/browser/oom_priority_manager_browsertest.cc @@ -8,6 +8,7 @@ #include "chrome/browser/ui/browser.h" #include "chrome/test/base/in_process_browser_test.h" #include "chrome/test/base/ui_test_utils.h" +#include "content/public/browser/notification_service.h" #include "content/public/browser/notification_types.h" #include "googleurl/src/gurl.h" @@ -20,21 +21,24 @@ IN_PROC_BROWSER_TEST_F(OomPriorityManagerTest, OomPriorityManagerBasics) { using namespace ui_test_utils; // Get three tabs open. Load asynchronously to speed up the test. - WindowedNotificationObserver load1(content::NOTIFICATION_LOAD_STOP, - NotificationService::AllSources()); + WindowedNotificationObserver load1( + content::NOTIFICATION_LOAD_STOP, + content::NotificationService::AllSources()); OpenURLParams open1(GURL("chrome://about"), GURL(), CURRENT_TAB, content::PAGE_TRANSITION_TYPED, false); browser()->OpenURL(open1); - WindowedNotificationObserver load2(content::NOTIFICATION_LOAD_STOP, - NotificationService::AllSources()); + WindowedNotificationObserver load2( + content::NOTIFICATION_LOAD_STOP, + content::NotificationService::AllSources()); OpenURLParams open2(GURL("chrome://credits"), GURL(), NEW_FOREGROUND_TAB, content::PAGE_TRANSITION_TYPED, false); browser()->OpenURL(open2); - WindowedNotificationObserver load3(content::NOTIFICATION_LOAD_STOP, - NotificationService::AllSources()); + WindowedNotificationObserver load3( + content::NOTIFICATION_LOAD_STOP, + content::NotificationService::AllSources()); OpenURLParams open3(GURL("chrome://terms"), GURL(), NEW_FOREGROUND_TAB, content::PAGE_TRANSITION_TYPED, false); @@ -71,8 +75,9 @@ IN_PROC_BROWSER_TEST_F(OomPriorityManagerTest, OomPriorityManagerBasics) { EXPECT_FALSE(g_browser_process->oom_priority_manager()->DiscardTab()); // Select the first tab. It should reload. - WindowedNotificationObserver reload1(content::NOTIFICATION_LOAD_STOP, - NotificationService::AllSources()); + WindowedNotificationObserver reload1( + content::NOTIFICATION_LOAD_STOP, + content::NotificationService::AllSources()); browser()->SelectNumberedTab(0); reload1.Wait(); EXPECT_FALSE(browser()->IsTabDiscarded(0)); |