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/user_script_master_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/user_script_master_unittest.cc')
-rw-r--r-- | chrome/browser/extensions/user_script_master_unittest.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/chrome/browser/extensions/user_script_master_unittest.cc b/chrome/browser/extensions/user_script_master_unittest.cc index 9d2abcc..dfd2eee 100644 --- a/chrome/browser/extensions/user_script_master_unittest.cc +++ b/chrome/browser/extensions/user_script_master_unittest.cc @@ -15,7 +15,7 @@ #include "chrome/common/chrome_notification_types.h" #include "chrome/test/base/testing_profile.h" #include "content/browser/browser_thread.h" -#include "content/common/notification_registrar.h" +#include "content/public/browser/notification_registrar.h" #include "content/common/notification_service.h" #include "testing/gtest/include/gtest/gtest.h" @@ -32,7 +32,7 @@ static void AddPattern(URLPatternSet* extent, const std::string& pattern) { // in there, etc. class UserScriptMasterTest : public testing::Test, - public NotificationObserver { + public content::NotificationObserver { public: UserScriptMasterTest() : message_loop_(MessageLoop::TYPE_UI), @@ -60,11 +60,11 @@ class UserScriptMasterTest : public testing::Test, } virtual void Observe(int type, - const NotificationSource& source, - const NotificationDetails& details) { + const content::NotificationSource& source, + const content::NotificationDetails& details) { DCHECK(type == chrome::NOTIFICATION_USER_SCRIPTS_UPDATED); - shared_memory_ = Details<base::SharedMemory>(details).ptr(); + shared_memory_ = content::Details<base::SharedMemory>(details).ptr(); if (MessageLoop::current() == &message_loop_) MessageLoop::current()->Quit(); } @@ -72,7 +72,7 @@ class UserScriptMasterTest : public testing::Test, // Directory containing user scripts. ScopedTempDir temp_dir_; - NotificationRegistrar registrar_; + content::NotificationRegistrar registrar_; // MessageLoop used in tests. MessageLoop message_loop_; |