Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(780)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: content/browser/notification_service_impl_unittest.cc

Issue 11340018: content/browser: Move notification_service_impl into content namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/browser/notification_service_impl.cc ('k') | content/public/test/test_content_client_initializer.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/notification_service_impl_unittest.cc
diff --git a/content/browser/notification_service_impl_unittest.cc b/content/browser/notification_service_impl_unittest.cc
index 62a0e51a81e2f93b4ce8a5b8113f454374606e80..2b9121624ed46d047628e540b0377967d5aa5dfd 100644
--- a/content/browser/notification_service_impl_unittest.cc
+++ b/content/browser/notification_service_impl_unittest.cc
@@ -3,29 +3,32 @@
// found in the LICENSE file.
#include "content/browser/notification_service_impl.h"
+
#include "content/public/browser/notification_observer.h"
#include "content/public/browser/notification_registrar.h"
#include "content/public/browser/notification_types.h"
#include "testing/gtest/include/gtest/gtest.h"
+namespace content {
+
namespace {
// Bogus class to act as a NotificationSource for the messages.
class TestSource {};
-class TestObserver : public content::NotificationObserver {
-public:
+class TestObserver : public NotificationObserver {
+ public:
TestObserver() : notification_count_(0) {}
- int notification_count() { return notification_count_; }
+ int notification_count() const { return notification_count_; }
- void Observe(int type,
- const content::NotificationSource& source,
- const content::NotificationDetails& details) {
+ virtual void Observe(int type,
+ const NotificationSource& source,
+ const NotificationDetails& details) OVERRIDE {
++notification_count_;
}
-private:
+ private:
int notification_count_;
};
@@ -34,7 +37,7 @@ private:
class NotificationServiceImplTest : public testing::Test {
protected:
- content::NotificationRegistrar registrar_;
+ NotificationRegistrar registrar_;
};
TEST_F(NotificationServiceImplTest, Basic) {
@@ -42,10 +45,10 @@ TEST_F(NotificationServiceImplTest, Basic) {
TestSource other_source;
// Check the equality operators defined for NotificationSource
- EXPECT_TRUE(content::Source<TestSource>(&test_source) ==
- content::Source<TestSource>(&test_source));
- EXPECT_TRUE(content::Source<TestSource>(&test_source) !=
- content::Source<TestSource>(&other_source));
+ EXPECT_TRUE(Source<TestSource>(&test_source) ==
+ Source<TestSource>(&test_source));
+ EXPECT_TRUE(Source<TestSource>(&test_source) !=
+ Source<TestSource>(&other_source));
TestObserver all_types_all_sources;
TestObserver idle_all_sources;
@@ -53,56 +56,55 @@ TEST_F(NotificationServiceImplTest, Basic) {
TestObserver idle_test_source;
// Make sure it doesn't freak out when there are no observers.
- content::NotificationService* service =
- content::NotificationService::current();
- service->Notify(content::NOTIFICATION_IDLE,
- content::Source<TestSource>(&test_source),
- content::NotificationService::NoDetails());
-
- registrar_.Add(&all_types_all_sources, content::NOTIFICATION_ALL,
- content::NotificationService::AllSources());
- registrar_.Add(&idle_all_sources, content::NOTIFICATION_IDLE,
- content::NotificationService::AllSources());
- registrar_.Add(&all_types_test_source, content::NOTIFICATION_ALL,
- content::Source<TestSource>(&test_source));
- registrar_.Add(&idle_test_source, content::NOTIFICATION_IDLE,
- content::Source<TestSource>(&test_source));
+ NotificationService* service = NotificationService::current();
+ service->Notify(NOTIFICATION_IDLE,
+ Source<TestSource>(&test_source),
+ NotificationService::NoDetails());
+
+ registrar_.Add(&all_types_all_sources, NOTIFICATION_ALL,
+ NotificationService::AllSources());
+ registrar_.Add(&idle_all_sources, NOTIFICATION_IDLE,
+ NotificationService::AllSources());
+ registrar_.Add(&all_types_test_source, NOTIFICATION_ALL,
+ Source<TestSource>(&test_source));
+ registrar_.Add(&idle_test_source, NOTIFICATION_IDLE,
+ Source<TestSource>(&test_source));
EXPECT_EQ(0, all_types_all_sources.notification_count());
EXPECT_EQ(0, idle_all_sources.notification_count());
EXPECT_EQ(0, all_types_test_source.notification_count());
EXPECT_EQ(0, idle_test_source.notification_count());
- service->Notify(content::NOTIFICATION_IDLE,
- content::Source<TestSource>(&test_source),
- content::NotificationService::NoDetails());
+ service->Notify(NOTIFICATION_IDLE,
+ Source<TestSource>(&test_source),
+ NotificationService::NoDetails());
EXPECT_EQ(1, all_types_all_sources.notification_count());
EXPECT_EQ(1, idle_all_sources.notification_count());
EXPECT_EQ(1, all_types_test_source.notification_count());
EXPECT_EQ(1, idle_test_source.notification_count());
- service->Notify(content::NOTIFICATION_BUSY,
- content::Source<TestSource>(&test_source),
- content::NotificationService::NoDetails());
+ service->Notify(NOTIFICATION_BUSY,
+ Source<TestSource>(&test_source),
+ NotificationService::NoDetails());
EXPECT_EQ(2, all_types_all_sources.notification_count());
EXPECT_EQ(1, idle_all_sources.notification_count());
EXPECT_EQ(2, all_types_test_source.notification_count());
EXPECT_EQ(1, idle_test_source.notification_count());
- service->Notify(content::NOTIFICATION_IDLE,
- content::Source<TestSource>(&other_source),
- content::NotificationService::NoDetails());
+ service->Notify(NOTIFICATION_IDLE,
+ Source<TestSource>(&other_source),
+ NotificationService::NoDetails());
EXPECT_EQ(3, all_types_all_sources.notification_count());
EXPECT_EQ(2, idle_all_sources.notification_count());
EXPECT_EQ(2, all_types_test_source.notification_count());
EXPECT_EQ(1, idle_test_source.notification_count());
- service->Notify(content::NOTIFICATION_BUSY,
- content::Source<TestSource>(&other_source),
- content::NotificationService::NoDetails());
+ service->Notify(NOTIFICATION_BUSY,
+ Source<TestSource>(&other_source),
+ NotificationService::NoDetails());
EXPECT_EQ(4, all_types_all_sources.notification_count());
EXPECT_EQ(2, idle_all_sources.notification_count());
@@ -110,9 +112,9 @@ TEST_F(NotificationServiceImplTest, Basic) {
EXPECT_EQ(1, idle_test_source.notification_count());
// Try send with NULL source.
- service->Notify(content::NOTIFICATION_IDLE,
- content::NotificationService::AllSources(),
- content::NotificationService::NoDetails());
+ service->Notify(NOTIFICATION_IDLE,
+ NotificationService::AllSources(),
+ NotificationService::NoDetails());
EXPECT_EQ(5, all_types_all_sources.notification_count());
EXPECT_EQ(3, idle_all_sources.notification_count());
@@ -121,9 +123,9 @@ TEST_F(NotificationServiceImplTest, Basic) {
registrar_.RemoveAll();
- service->Notify(content::NOTIFICATION_IDLE,
- content::Source<TestSource>(&test_source),
- content::NotificationService::NoDetails());
+ service->Notify(NOTIFICATION_IDLE,
+ Source<TestSource>(&test_source),
+ NotificationService::NoDetails());
EXPECT_EQ(5, all_types_all_sources.notification_count());
EXPECT_EQ(3, idle_all_sources.notification_count());
@@ -136,32 +138,33 @@ TEST_F(NotificationServiceImplTest, MultipleRegistration) {
TestObserver idle_test_source;
- content::NotificationService* service =
- content::NotificationService::current();
+ NotificationService* service = NotificationService::current();
- registrar_.Add(&idle_test_source, content::NOTIFICATION_IDLE,
- content::Source<TestSource>(&test_source));
- registrar_.Add(&idle_test_source, content::NOTIFICATION_ALL,
- content::Source<TestSource>(&test_source));
+ registrar_.Add(&idle_test_source, NOTIFICATION_IDLE,
+ Source<TestSource>(&test_source));
+ registrar_.Add(&idle_test_source, NOTIFICATION_ALL,
+ Source<TestSource>(&test_source));
- service->Notify(content::NOTIFICATION_IDLE,
- content::Source<TestSource>(&test_source),
- content::NotificationService::NoDetails());
+ service->Notify(NOTIFICATION_IDLE,
+ Source<TestSource>(&test_source),
+ NotificationService::NoDetails());
EXPECT_EQ(2, idle_test_source.notification_count());
- registrar_.Remove(&idle_test_source, content::NOTIFICATION_IDLE,
- content::Source<TestSource>(&test_source));
+ registrar_.Remove(&idle_test_source, NOTIFICATION_IDLE,
+ Source<TestSource>(&test_source));
- service->Notify(content::NOTIFICATION_IDLE,
- content::Source<TestSource>(&test_source),
- content::NotificationService::NoDetails());
+ service->Notify(NOTIFICATION_IDLE,
+ Source<TestSource>(&test_source),
+ NotificationService::NoDetails());
EXPECT_EQ(3, idle_test_source.notification_count());
- registrar_.Remove(&idle_test_source, content::NOTIFICATION_ALL,
- content::Source<TestSource>(&test_source));
+ registrar_.Remove(&idle_test_source, NOTIFICATION_ALL,
+ Source<TestSource>(&test_source));
- service->Notify(content::NOTIFICATION_IDLE,
- content::Source<TestSource>(&test_source),
- content::NotificationService::NoDetails());
+ service->Notify(NOTIFICATION_IDLE,
+ Source<TestSource>(&test_source),
+ NotificationService::NoDetails());
EXPECT_EQ(3, idle_test_source.notification_count());
}
+
+} // namespace content
« no previous file with comments | « content/browser/notification_service_impl.cc ('k') | content/public/test/test_content_client_initializer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698