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_frame | |
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_frame')
-rw-r--r-- | chrome_frame/test/net/fake_external_tab.cc | 6 | ||||
-rw-r--r-- | chrome_frame/test/net/fake_external_tab.h | 5 |
2 files changed, 7 insertions, 4 deletions
diff --git a/chrome_frame/test/net/fake_external_tab.cc b/chrome_frame/test/net/fake_external_tab.cc index cb67909..c6952e7 100644 --- a/chrome_frame/test/net/fake_external_tab.cc +++ b/chrome_frame/test/net/fake_external_tab.cc @@ -49,7 +49,7 @@ #include "content/browser/plugin_service.h" #include "content/browser/renderer_host/render_process_host.h" #include "content/common/content_paths.h" -#include "content/common/notification_service.h" +#include "content/browser/notification_service_impl.h" #include "content/public/common/content_client.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/base/resource/resource_bundle.h" @@ -232,7 +232,7 @@ FakeExternalTab::~FakeExternalTab() { void FakeExternalTab::Initialize() { DCHECK(g_browser_process == NULL); - notificaton_service_.reset(new NotificationService); + notificaton_service_.reset(new NotificationServiceImpl); base::SystemMonitor system_monitor; @@ -409,7 +409,7 @@ void CFUrlRequestUnittestRunner::StartTests() { DWORD CFUrlRequestUnittestRunner::RunAllUnittests(void* param) { base::PlatformThread::SetName("CFUrlRequestUnittestRunner"); // Needed for some url request tests like the intercept job tests, etc. - NotificationService service; + NotificationServiceImpl service; CFUrlRequestUnittestRunner* me = reinterpret_cast<CFUrlRequestUnittestRunner*>(param); me->test_result_ = me->Run(); diff --git a/chrome_frame/test/net/fake_external_tab.h b/chrome_frame/test/net/fake_external_tab.h index f93783a..f804bb2 100644 --- a/chrome_frame/test/net/fake_external_tab.h +++ b/chrome_frame/test/net/fake_external_tab.h @@ -21,7 +21,10 @@ #include "net/base/net_test_suite.h" class ProcessSingleton; + +namespace content { class NotificationService; +} class FakeExternalTab { public: @@ -45,7 +48,7 @@ class FakeExternalTab { FilePath overridden_user_dir_; FilePath user_data_dir_; scoped_ptr<ProcessSingleton> process_singleton_; - scoped_ptr<NotificationService> notificaton_service_; + scoped_ptr<content::NotificationService> notificaton_service_; }; // The "master class" that spins the UI and test threads. |