summaryrefslogtreecommitdiffstats
path: root/chrome/browser/prefs/pref_notifier_impl_unittest.cc
diff options
context:
space:
mode:
authorjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-19 02:52:53 +0000
committerjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-19 02:52:53 +0000
commit6c2381d5ec28a86536c07dfa4a398a2b6bc1a58c (patch)
treea75584b11b8ef188b4eb3376b9146e063823a916 /chrome/browser/prefs/pref_notifier_impl_unittest.cc
parentbf3ee201c1ca5112f7fd173fc4785aa52920c5c0 (diff)
downloadchromium_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/prefs/pref_notifier_impl_unittest.cc')
-rw-r--r--chrome/browser/prefs/pref_notifier_impl_unittest.cc18
1 files changed, 9 insertions, 9 deletions
diff --git a/chrome/browser/prefs/pref_notifier_impl_unittest.cc b/chrome/browser/prefs/pref_notifier_impl_unittest.cc
index 1beb430c..8eb017c 100644
--- a/chrome/browser/prefs/pref_notifier_impl_unittest.cc
+++ b/chrome/browser/prefs/pref_notifier_impl_unittest.cc
@@ -8,9 +8,9 @@
#include "chrome/browser/prefs/pref_value_store.h"
#include "chrome/common/chrome_notification_types.h"
#include "chrome/test/base/testing_pref_service.h"
-#include "content/common/notification_observer_mock.h"
-#include "content/common/notification_registrar.h"
+#include "content/public/browser/notification_registrar.h"
#include "content/common/notification_service.h"
+#include "content/test/notification_observer_mock.h"
#include "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -34,7 +34,7 @@ class MockPrefNotifier : public PrefNotifierImpl {
MOCK_METHOD1(FireObservers, void(const std::string& path));
- size_t CountObserver(const char* path, NotificationObserver* obs) {
+ size_t CountObserver(const char* path, content::NotificationObserver* obs) {
PrefObserverMap::const_iterator observer_iterator =
pref_observers()->find(path);
if (observer_iterator == pref_observers()->end())
@@ -42,7 +42,7 @@ class MockPrefNotifier : public PrefNotifierImpl {
NotificationObserverList* observer_list = observer_iterator->second;
NotificationObserverList::Iterator it(*observer_list);
- NotificationObserver* existing_obs;
+ content::NotificationObserver* existing_obs;
size_t count = 0;
while ((existing_obs = it.GetNext()) != NULL) {
if (existing_obs == obs)
@@ -79,14 +79,14 @@ TEST_F(PrefNotifierTest, OnPreferenceChanged) {
TEST_F(PrefNotifierTest, OnInitializationCompleted) {
MockPrefNotifier notifier(&pref_service_);
- NotificationObserverMock observer;
- NotificationRegistrar registrar;
+ content::NotificationObserverMock observer;
+ content::NotificationRegistrar registrar;
registrar.Add(&observer, chrome::NOTIFICATION_PREF_INITIALIZATION_COMPLETED,
- Source<PrefService>(&pref_service_));
+ content::Source<PrefService>(&pref_service_));
EXPECT_CALL(observer, Observe(
int(chrome::NOTIFICATION_PREF_INITIALIZATION_COMPLETED),
- Source<PrefService>(&pref_service_),
- Property(&Details<bool>::ptr, testing::Pointee(true))));
+ content::Source<PrefService>(&pref_service_),
+ Property(&content::Details<bool>::ptr, testing::Pointee(true))));
notifier.OnInitializationCompleted(true);
}