Index: chrome/browser/notifications/desktop_notification_profile_util_unittest.cc |
diff --git a/chrome/browser/notifications/desktop_notification_service_unittest.cc b/chrome/browser/notifications/desktop_notification_profile_util_unittest.cc |
similarity index 66% |
rename from chrome/browser/notifications/desktop_notification_service_unittest.cc |
rename to chrome/browser/notifications/desktop_notification_profile_util_unittest.cc |
index 8351f5aefebfdcb23d2794135e838b383b71ece8..150f07da80f3cb5d20473d6895180c15c9e1641d 100644 |
--- a/chrome/browser/notifications/desktop_notification_service_unittest.cc |
+++ b/chrome/browser/notifications/desktop_notification_profile_util_unittest.cc |
@@ -1,40 +1,34 @@ |
-// Copyright (c) 2011 The Chromium Authors. All rights reserved. |
+// Copyright 2014 The Chromium Authors. All rights reserved. |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
-#include "chrome/browser/notifications/desktop_notification_service.h" |
- |
#include "base/bind.h" |
-#include "base/memory/scoped_ptr.h" |
-#include "base/message_loop/message_loop.h" |
-#include "base/synchronization/waitable_event.h" |
-#include "chrome/browser/notifications/desktop_notification_service_factory.h" |
+#include "chrome/browser/notifications/desktop_notification_profile_util.h" |
#include "chrome/test/base/chrome_render_view_host_test_harness.h" |
#include "chrome/test/base/testing_profile.h" |
#include "testing/gtest/include/gtest/gtest.h" |
-#include "third_party/WebKit/public/web/WebNotificationPresenter.h" |
class DesktopNotificationServiceTest : public ChromeRenderViewHostTestHarness { |
protected: |
virtual void SetUp() { |
ChromeRenderViewHostTestHarness::SetUp(); |
- |
- // Creates the destop notification service. |
- service_ = DesktopNotificationServiceFactory::GetForProfile(profile()); |
} |
- |
- DesktopNotificationService* service_; |
}; |
TEST_F(DesktopNotificationServiceTest, GetNotificationsSettings) { |
- service_->GrantPermission(GURL("http://allowed2.com")); |
- service_->GrantPermission(GURL("http://allowed.com")); |
- service_->DenyPermission(GURL("http://denied2.com")); |
- service_->DenyPermission(GURL("http://denied.com")); |
+ DesktopNotificationProfileUtil::GrantPermission(profile(), |
+ GURL("http://allowed2.com")); |
+ DesktopNotificationProfileUtil::GrantPermission(profile(), |
+ GURL("http://allowed.com")); |
+ DesktopNotificationProfileUtil::DenyPermission(profile(), |
+ GURL("http://denied2.com")); |
+ DesktopNotificationProfileUtil::DenyPermission(profile(), |
+ GURL("http://denied.com")); |
ContentSettingsForOneType settings; |
- service_->GetNotificationsSettings(&settings); |
+ DesktopNotificationProfileUtil::GetNotificationsSettings( |
+ profile(), &settings); |
// |settings| contains the default setting and 4 exceptions. |
ASSERT_EQ(5u, settings.size()); |