Nuke NotificationUIManager from PlatformNotificationServiceImpl

chrome/browser/notifications/platform_notification_service_unittest.cc

 // 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 <stdint.h>
 
 #include <utility>
 
 #include "base/macros.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/threading/platform_thread.h"
 #include "base/time/time.h"
 #include "build/build_config.h"
 #include "chrome/browser/content_settings/host_content_settings_map_factory.h"
+#include "chrome/browser/notifications/chrome_notification_display_service.h"
 #include "chrome/browser/notifications/notification_delegate.h"
 #include "chrome/browser/notifications/notification_test_util.h"
 #include "chrome/browser/notifications/platform_notification_service_impl.h"
+#include "chrome/test/base/testing_browser_process.h"
 #include "chrome/test/base/testing_profile.h"
+#include "chrome/test/base/testing_profile_manager.h"
 #include "components/content_settings/core/browser/host_content_settings_map.h"
 #include "content/public/browser/desktop_notification_delegate.h"
 #include "content/public/common/notification_resources.h"
 #include "content/public/common/platform_notification_data.h"
 #include "content/public/test/test_browser_thread_bundle.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 #if defined(ENABLE_EXTENSIONS)
 #include "base/command_line.h"
@@ skipping 44 matching lines @@
  private:
   bool displayed_;
   bool clicked_;
 };
 
 }  // namespace
 
 class PlatformNotificationServiceTest : public testing::Test {
  public:
   void SetUp() override {
+    profile_.reset(new TestingProfile());
     ui_manager_.reset(new StubNotificationUIManager);
-    profile_.reset(new TestingProfile());
-
-    service()->SetNotificationUIManagerForTesting(ui_manager_.get());
+    display_service_.reset(new ChromeNotificationDisplayService(
+        profile_.get(), ui_manager_.get()));
+    service()->SetNotificationDisplayServiceForTesting(display_service_.get());
+    profile_manager_.reset(
+        new TestingProfileManager(TestingBrowserProcess::GetGlobal()));
+    ASSERT_TRUE(profile_manager_->SetUp());
   }
 
   void TearDown() override {
-    service()->SetNotificationUIManagerForTesting(nullptr);
-
+    service()->SetNotificationDisplayServiceForTesting(nullptr);
+    display_service_.reset();
+    ui_manager_.reset();
     profile_.reset();
-    ui_manager_.reset();
+    profile_manager_.reset();
+    TestingBrowserProcess::DeleteInstance();
   }
 
  protected:
   // Displays a simple, fake notifications and returns a weak pointer to the
   // delegate receiving events for it (ownership is transferred to the service).
   MockDesktopNotificationDelegate* CreateSimplePageNotification() const {
     return CreateSimplePageNotificationWithCloseClosure(nullptr);
   }
 
   // Displays a simple, fake notification and returns a weak pointer to the
@@ skipping 20 matching lines @@
     return PlatformNotificationServiceImpl::GetInstance();
   }
 
   // Returns the Profile to be used for these tests.
   Profile* profile() const { return profile_.get(); }
 
   // Returns the UI Manager on which notifications will be displayed.
   StubNotificationUIManager* ui_manager() const { return ui_manager_.get(); }
 
  private:
+  scoped_ptr<TestingProfile> profile_;
   scoped_ptr<StubNotificationUIManager> ui_manager_;
-  scoped_ptr<TestingProfile> profile_;
+  scoped_ptr<ChromeNotificationDisplayService> display_service_;
 
+  scoped_ptr<TestingProfileManager> profile_manager_;
   content::TestBrowserThreadBundle thread_bundle_;
 };
 
 TEST_F(PlatformNotificationServiceTest, DisplayPageDisplayedEvent) {
   auto* delegate = CreateSimplePageNotification();
 
   EXPECT_EQ(1u, ui_manager()->GetNotificationCount());
   EXPECT_TRUE(delegate->displayed());
 }
 
@@ skipping 252 matching lines @@
   notification = service()->CreateNotificationFromData(
       profile(),
       GURL("chrome-extension://honijodknafkokifofgiaalefdiedpko/main.html"),
       notification_data, NotificationResources(),
       new MockNotificationDelegate("hello"));
   EXPECT_EQ("NotificationTest",
             base::UTF16ToUTF8(notification.context_message()));
 }
 
 #endif  // defined(ENABLE_EXTENSIONS)