chrome/browser/push_messaging/push_messaging_browsertest.cc - Issue 1814923002: Nuke NotificationUIManager from PlatformNotificationServiceImpl

Unified Diff: chrome/browser/push_messaging/push_messaging_browsertest.cc

Issue 1814923002: Nuke NotificationUIManager from PlatformNotificationServiceImpl (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@profile_manager_load

Patch Set: Review comments + unique_ptr rename Created 4 years, 8 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

« chrome/browser/notifications/platform_notification_service_impl.cc ('K') | « chrome/browser/notifications/platform_notification_service_unittest.cc ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/push_messaging/push_messaging_browsertest.cc

diff --git a/chrome/browser/push_messaging/push_messaging_browsertest.cc b/chrome/browser/push_messaging/push_messaging_browsertest.cc

index 25014739d023f997d0cfa8f4268693a476d9f291..eade560989f097adb3b81c5f1c3681fe4b0b6eae 100644

--- a/chrome/browser/push_messaging/push_messaging_browsertest.cc

+++ b/chrome/browser/push_messaging/push_messaging_browsertest.cc

@@ -22,6 +22,7 @@

#include "chrome/browser/browsing_data/browsing_data_remover_factory.h"

#include "chrome/browser/browsing_data/browsing_data_remover_test_util.h"

#include "chrome/browser/content_settings/host_content_settings_map_factory.h"

+#include "chrome/browser/notifications/message_center_display_service.h"

#include "chrome/browser/notifications/notification_test_util.h"

#include "chrome/browser/notifications/platform_notification_service_impl.h"

#include "chrome/browser/profiles/profile.h"

@@ -114,8 +115,6 @@ class PushMessagingBrowserTest : public InProcessBrowserTest {

#if defined(ENABLE_NOTIFICATIONS)

notification_manager_.reset(new StubNotificationUIManager);

- notification_service()->SetNotificationUIManagerForTesting(

- notification_manager());

#endif

InProcessBrowserTest::SetUp();

@@ -136,9 +135,14 @@ class PushMessagingBrowserTest : public InProcessBrowserTest {

gcm_service_->set_collect(true);

push_service_ =

PushMessagingServiceFactory::GetForProfile(GetBrowser()->profile());

+#if defined(ENABLE_NOTIFICATIONS)

+ display_service_.reset(new MessageCenterDisplayService(

+ GetBrowser()->profile(), notification_manager_.get()));

+ notification_service()->SetNotificationDisplayServiceForTesting(

+ display_service_.get());

+#endif

LoadTestPage();

InProcessBrowserTest::SetUpOnMainThread();

}

@@ -155,7 +159,7 @@ class PushMessagingBrowserTest : public InProcessBrowserTest {

// InProcessBrowserTest:

void TearDown() override {

#if defined(ENABLE_NOTIFICATIONS)

- notification_service()->SetNotificationUIManagerForTesting(nullptr);

+ notification_service()->SetNotificationDisplayServiceForTesting(nullptr);

#endif

InProcessBrowserTest::TearDown();

@@ -247,6 +251,7 @@ class PushMessagingBrowserTest : public InProcessBrowserTest {

#if defined(ENABLE_NOTIFICATIONS)

Peter Beverloo 2016/04/20 17:34:08 On a tangent, now that iOS doesn't use //chrome an

Miguel Garcia 2016/04/21 14:32:10 Acknowledged.

std::unique_ptr<StubNotificationUIManager> notification_manager_;

+ std::unique_ptr<MessageCenterDisplayService> display_service_;

#endif

DISALLOW_COPY_AND_ASSIGN(PushMessagingBrowserTest);