diff options
author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-19 02:52:53 +0000 |
---|---|---|
committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-19 02:52:53 +0000 |
commit | 6c2381d5ec28a86536c07dfa4a398a2b6bc1a58c (patch) | |
tree | a75584b11b8ef188b4eb3376b9146e063823a916 /chrome/browser/extensions/extension_service_unittest.cc | |
parent | bf3ee201c1ca5112f7fd173fc4785aa52920c5c0 (diff) | |
download | chromium_src-6c2381d5ec28a86536c07dfa4a398a2b6bc1a58c.zip chromium_src-6c2381d5ec28a86536c07dfa4a398a2b6bc1a58c.tar.gz chromium_src-6c2381d5ec28a86536c07dfa4a398a2b6bc1a58c.tar.bz2 |
Move NotificationObserver, NotificationSource, and NotificationDetails to content/public/browser.
This patch got way bigger than I wanted, but once I moved NotificationDetails, I figured I might as well mvoe the others since they're in the same files. In hindsight, I should have converted a subset of files at a time by leaving a using statement in the header.
BUG=98716
TBR=joi
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@106196 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/extension_service_unittest.cc')
-rw-r--r-- | chrome/browser/extensions/extension_service_unittest.cc | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/chrome/browser/extensions/extension_service_unittest.cc b/chrome/browser/extensions/extension_service_unittest.cc index ff89e5e2..127737f 100644 --- a/chrome/browser/extensions/extension_service_unittest.cc +++ b/chrome/browser/extensions/extension_service_unittest.cc @@ -58,7 +58,7 @@ #include "content/browser/file_system/browser_file_system_helper.h" #include "content/browser/in_process_webkit/dom_storage_context.h" #include "content/browser/in_process_webkit/webkit_context.h" -#include "content/common/notification_registrar.h" +#include "content/public/browser/notification_registrar.h" #include "content/common/notification_service.h" #include "googleurl/src/gurl.h" #include "net/base/cookie_monster.h" @@ -481,7 +481,7 @@ void ExtensionServiceTestBase::SetUp() { } class ExtensionServiceTest - : public ExtensionServiceTestBase, public NotificationObserver { + : public ExtensionServiceTestBase, public content::NotificationObserver { public: ExtensionServiceTest() : installed_(NULL) { registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_LOADED, @@ -493,11 +493,12 @@ class ExtensionServiceTest } virtual void Observe(int type, - const NotificationSource& source, - const NotificationDetails& details) { + const content::NotificationSource& source, + const content::NotificationDetails& details) { switch (type) { case chrome::NOTIFICATION_EXTENSION_LOADED: { - const Extension* extension = Details<const Extension>(details).ptr(); + const Extension* extension = + content::Details<const Extension>(details).ptr(); loaded_.push_back(make_scoped_refptr(extension)); // The tests rely on the errors being in a certain order, which can vary // depending on how filesystem iteration works. @@ -507,7 +508,7 @@ class ExtensionServiceTest case chrome::NOTIFICATION_EXTENSION_UNLOADED: { const Extension* e = - Details<UnloadedExtensionInfo>(details)->extension; + content::Details<UnloadedExtensionInfo>(details)->extension; unloaded_id_ = e->id(); ExtensionList::iterator i = std::find(loaded_.begin(), loaded_.end(), e); @@ -519,7 +520,7 @@ class ExtensionServiceTest break; } case chrome::NOTIFICATION_EXTENSION_INSTALLED: - installed_ = Details<const Extension>(details).ptr(); + installed_ = content::Details<const Extension>(details).ptr(); break; default: @@ -911,7 +912,7 @@ class ExtensionServiceTest const Extension* installed_; private: - NotificationRegistrar registrar_; + content::NotificationRegistrar registrar_; }; FilePath NormalizeSeparators(const FilePath& path) { @@ -3462,7 +3463,7 @@ TEST_F(ExtensionServiceTest, LoadAndRelocalizeExtensions) { EXPECT_EQ("no l10n", loaded_[2]->name()); } -class ExtensionsReadyRecorder : public NotificationObserver { +class ExtensionsReadyRecorder : public content::NotificationObserver { public: ExtensionsReadyRecorder() : ready_(false) { registrar_.Add(this, chrome::NOTIFICATION_EXTENSIONS_READY, @@ -3474,8 +3475,8 @@ class ExtensionsReadyRecorder : public NotificationObserver { private: virtual void Observe(int type, - const NotificationSource& source, - const NotificationDetails& details) { + const content::NotificationSource& source, + const content::NotificationDetails& details) { switch (type) { case chrome::NOTIFICATION_EXTENSIONS_READY: ready_ = true; @@ -3485,7 +3486,7 @@ class ExtensionsReadyRecorder : public NotificationObserver { } } - NotificationRegistrar registrar_; + content::NotificationRegistrar registrar_; bool ready_; }; |