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/ui/browser_navigator_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/ui/browser_navigator_browsertest.cc')
| -rw-r--r-- | chrome/browser/ui/browser_navigator_browsertest.cc | 48 |
1 files changed, 32 insertions, 16 deletions
diff --git a/chrome/browser/ui/browser_navigator_browsertest.cc b/chrome/browser/ui/browser_navigator_browsertest.cc index 2ac3d38..1dbb518 100644 --- a/chrome/browser/ui/browser_navigator_browsertest.cc +++ b/chrome/browser/ui/browser_navigator_browsertest.cc @@ -20,6 +20,7 @@ #include "chrome/test/base/ui_test_utils.h" #include "content/browser/tab_contents/tab_contents.h" #include "content/browser/tab_contents/tab_contents_view.h" +#include "content/public/browser/notification_service.h" #include "content/public/browser/notification_types.h" namespace { @@ -137,7 +138,7 @@ IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest, Disposition_SingletonTabExisting) { // As the registrar object goes out of scope, this will get unregistered registrar.Add(this, content::NOTIFICATION_RENDER_VIEW_HOST_CREATED_FOR_TAB, - NotificationService::AllSources()); + content::NotificationService::AllSources()); browser()->AddSelectedTabWithURL( singleton_url1, content::PAGE_TRANSITION_LINK); @@ -922,7 +923,8 @@ IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest, params.disposition = OFF_THE_RECORD; { ui_test_utils::WindowedNotificationObserver observer( - content::NOTIFICATION_LOAD_STOP, NotificationService::AllSources()); + content::NOTIFICATION_LOAD_STOP, + content::NotificationService::AllSources()); browser::Navigate(¶ms); observer.Wait(); } @@ -989,7 +991,8 @@ IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest, NavigateFromDefaultToOptionsInSameTab) { { ui_test_utils::WindowedNotificationObserver observer( - content::NOTIFICATION_LOAD_STOP, NotificationService::AllSources()); + content::NOTIFICATION_LOAD_STOP, + content::NotificationService::AllSources()); browser()->OpenOptionsDialog(); observer.Wait(); } @@ -1006,7 +1009,8 @@ IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest, { ui_test_utils::WindowedNotificationObserver observer( - content::NOTIFICATION_LOAD_STOP, NotificationService::AllSources()); + content::NOTIFICATION_LOAD_STOP, + content::NotificationService::AllSources()); browser()->OpenOptionsDialog(); observer.Wait(); } @@ -1026,7 +1030,8 @@ IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest, { ui_test_utils::WindowedNotificationObserver observer( - content::NOTIFICATION_LOAD_STOP, NotificationService::AllSources()); + content::NOTIFICATION_LOAD_STOP, + content::NotificationService::AllSources()); browser()->OpenOptionsDialog(); observer.Wait(); } @@ -1045,7 +1050,8 @@ IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest, { ui_test_utils::WindowedNotificationObserver observer( - content::NOTIFICATION_LOAD_STOP, NotificationService::AllSources()); + content::NOTIFICATION_LOAD_STOP, + content::NotificationService::AllSources()); browser()->OpenOptionsDialog(); observer.Wait(); } @@ -1058,7 +1064,8 @@ IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest, NavigateFromNTPToOptionsSingleton) { { ui_test_utils::WindowedNotificationObserver observer( - content::NOTIFICATION_LOAD_STOP, NotificationService::AllSources()); + content::NOTIFICATION_LOAD_STOP, + content::NotificationService::AllSources()); browser()->OpenOptionsDialog(); observer.Wait(); } @@ -1069,7 +1076,8 @@ IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest, { ui_test_utils::WindowedNotificationObserver observer( - content::NOTIFICATION_LOAD_STOP, NotificationService::AllSources()); + content::NOTIFICATION_LOAD_STOP, + content::NotificationService::AllSources()); browser()->OpenOptionsDialog(); observer.Wait(); } @@ -1082,7 +1090,8 @@ IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest, NavigateFromNTPToOptionsPageInSameTab) { { ui_test_utils::WindowedNotificationObserver observer( - content::NOTIFICATION_LOAD_STOP, NotificationService::AllSources()); + content::NOTIFICATION_LOAD_STOP, + content::NotificationService::AllSources()); browser()->ShowOptionsTab(chrome::kPersonalOptionsSubPage); observer.Wait(); } @@ -1095,7 +1104,8 @@ IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest, { ui_test_utils::WindowedNotificationObserver observer( - content::NOTIFICATION_LOAD_STOP, NotificationService::AllSources()); + content::NOTIFICATION_LOAD_STOP, + content::NotificationService::AllSources()); browser()->ShowOptionsTab(chrome::kPersonalOptionsSubPage); observer.Wait(); } @@ -1108,13 +1118,15 @@ IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest, NavigateFromOtherTabToSingletonOptions) { { ui_test_utils::WindowedNotificationObserver observer( - content::NOTIFICATION_LOAD_STOP, NotificationService::AllSources()); + content::NOTIFICATION_LOAD_STOP, + content::NotificationService::AllSources()); browser()->OpenOptionsDialog(); observer.Wait(); } { ui_test_utils::WindowedNotificationObserver observer( - content::NOTIFICATION_LOAD_STOP, NotificationService::AllSources()); + content::NOTIFICATION_LOAD_STOP, + content::NotificationService::AllSources()); browser()->AddSelectedTabWithURL( GetGoogleURL(), content::PAGE_TRANSITION_LINK); observer.Wait(); @@ -1122,7 +1134,8 @@ IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest, { ui_test_utils::WindowedNotificationObserver observer( - content::NOTIFICATION_LOAD_STOP, NotificationService::AllSources()); + content::NOTIFICATION_LOAD_STOP, + content::NotificationService::AllSources()); browser()->OpenOptionsDialog(); observer.Wait(); } @@ -1173,7 +1186,8 @@ IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest, NavigateFromDefaultToHistoryInSameTab) { { ui_test_utils::WindowedNotificationObserver observer( - content::NOTIFICATION_LOAD_STOP, NotificationService::AllSources()); + content::NOTIFICATION_LOAD_STOP, + content::NotificationService::AllSources()); browser()->ShowHistoryTab(); observer.Wait(); } @@ -1186,7 +1200,8 @@ IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest, NavigateFromDefaultToBookmarksInSameTab) { { ui_test_utils::WindowedNotificationObserver observer( - content::NOTIFICATION_LOAD_STOP, NotificationService::AllSources()); + content::NOTIFICATION_LOAD_STOP, + content::NotificationService::AllSources()); browser()->OpenBookmarkManager(); observer.Wait(); } @@ -1199,7 +1214,8 @@ IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest, NavigateFromDefaultToDownloadsInSameTab) { { ui_test_utils::WindowedNotificationObserver observer( - content::NOTIFICATION_LOAD_STOP, NotificationService::AllSources()); + content::NOTIFICATION_LOAD_STOP, + content::NotificationService::AllSources()); browser()->ShowDownloadsTab(); observer.Wait(); } |