Support persistent notifications in the PlatformNotificationServiceImpl.

chrome/browser/notifications/platform_notification_service_browsertest.cc

Index: chrome/browser/notifications/platform_notification_service_browsertest.cc
diff --git a/chrome/browser/notifications/platform_notification_service_browsertest.cc b/chrome/browser/notifications/platform_notification_service_browsertest.cc
new file mode 100644
index 0000000000000000000000000000000000000000..a9426295093cb8319b3131f8c8ac661e4eb806cd
--- /dev/null
+++ b/chrome/browser/notifications/platform_notification_service_browsertest.cc
@@ -0,0 +1,237 @@
+// 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 <string>
+
+#include "base/command_line.h"
+#include "base/files/file_path.h"
+#include "base/memory/scoped_ptr.h"
+#include "chrome/browser/infobars/infobar_service.h"
+#include "chrome/browser/notifications/notification_test_util.h"
+#include "chrome/browser/notifications/platform_notification_service_impl.h"
+#include "chrome/browser/ui/browser.h"
+#include "chrome/browser/ui/tabs/tab_strip_model.h"
+#include "chrome/test/base/in_process_browser_test.h"
+#include "chrome/test/base/ui_test_utils.h"
+#include "components/infobars/core/confirm_infobar_delegate.h"
+#include "components/infobars/core/infobar.h"
+#include "components/infobars/core/infobar_manager.h"
+#include "content/public/common/content_switches.h"
+#include "content/public/test/browser_test_utils.h"
+#include "net/test/spawned_test_server/spawned_test_server.h"
+
+// -----------------------------------------------------------------------------
+
+// Accept or rejects the first shown confirm infobar. The infobar will be
+// responsed to asynchronously, to immitate the behavior of a user.

[Michael van Ouwerkerk, 2014/12/11 16:41:55]

nit: imitate

[Peter Beverloo, 2014/12/11 19:02:00]

Done.

+// TODO(peter): Generalize this class, as it's commonly useful.
+class InfoBarResponder : public infobars::InfoBarManager::Observer {
+ public:
+  InfoBarResponder(Browser* browser, bool accept);
+  ~InfoBarResponder() override;
+
+

[Michael van Ouwerkerk, 2014/12/11 16:41:55]

nit: blank line --

[Peter Beverloo, 2014/12/11 19:02:00]

Done.

+  // infobars::InfoBarManager::Observer overrides.
+  void OnInfoBarAdded(infobars::InfoBar* infobar) override;
+
+ private:
+  void Respond(ConfirmInfoBarDelegate* delegate);
+
+  InfoBarService* infobar_service_;
+  bool accept_;
+  bool has_observed_;
+};
+
+InfoBarResponder::InfoBarResponder(Browser* browser, bool accept)
+    : infobar_service_(InfoBarService::FromWebContents(
+            browser->tab_strip_model()->GetActiveWebContents())),
+      accept_(accept),
+      has_observed_(false) {
+  infobar_service_->AddObserver(this);
+}
+
+InfoBarResponder::~InfoBarResponder() {
+  infobar_service_->RemoveObserver(this);
+}
+
+void InfoBarResponder::OnInfoBarAdded(infobars::InfoBar* infobar) {
+  if (has_observed_)
+    return;
+
+  has_observed_ = true;
+  ConfirmInfoBarDelegate* delegate =
+      infobar->delegate()->AsConfirmInfoBarDelegate();
+  DCHECK(delegate);
+
+  // Respond to the infobar asynchronously, like a person.
+  base::MessageLoop::current()->PostTask(
+      FROM_HERE,
+      base::Bind(
+          &InfoBarResponder::Respond, base::Unretained(this), delegate));
+}
+
+void InfoBarResponder::Respond(ConfirmInfoBarDelegate* delegate) {
+  if (accept_) {

[Michael van Ouwerkerk, 2014/12/11 16:41:55]

nit: wanna omit the curly braces?

[Peter Beverloo, 2014/12/11 19:02:00]

Done.

+    delegate->Accept();
+  } else {
+    delegate->Cancel();
+  }
+}
+
+// -----------------------------------------------------------------------------
+
+class PlatformNotificationServiceBrowserTest : public InProcessBrowserTest {
+ public:
+  ~PlatformNotificationServiceBrowserTest() override {}
+
+  // InProcessBrowserTest overrides.
+  void SetUpCommandLine(base::CommandLine* command_line) override;
+  void SetUp() override;
+  void SetUpOnMainThread() override;
+  void TearDown() override;
+
+ protected:
+  // Returns the Platform Notification Service these unit tests are for.
+  PlatformNotificationServiceImpl* service() const {
+    return PlatformNotificationServiceImpl::GetInstance();
+  }
+
+  // Returns the UI Manager on which notifications will be displayed.
+  StubNotificationUIManager* ui_manager() const { return ui_manager_.get(); }
+
+  // Navigates the browser to the test page indicated by |path|.
+  void NavigateToTestPage(const std::string& path) const;
+
+  // Executes |script| and stores the result as a string in |result|. A boolean
+  // will be returned, indicating whether the JavaScript could be executed.

[Michael van Ouwerkerk, 2014/12/11 16:41:55]

nit: s/could be executed/was executed successfully/

[Peter Beverloo, 2014/12/11 19:02:00]

Done.

+  bool RunScript(const std::string& script, std::string* result) const;
+
+ private:
+  scoped_ptr<StubNotificationUIManager> ui_manager_;
+  scoped_ptr<net::SpawnedTestServer> https_server_;
+};
+
+// -----------------------------------------------------------------------------
+
+namespace {
+
+const char kTestPageUrl[] =
+    "files/notifications/platform_notification_service.html";
+
+}  // namespace
+
+void PlatformNotificationServiceBrowserTest::SetUpCommandLine(
+    base::CommandLine* command_line) {
+  command_line->AppendSwitch(
+      switches::kEnableExperimentalWebPlatformFeatures);
+
+  InProcessBrowserTest::SetUpCommandLine(command_line);
+}
+
+void PlatformNotificationServiceBrowserTest::SetUp() {
+  ui_manager_.reset(new StubNotificationUIManager);
+  https_server_.reset(new net::SpawnedTestServer(

[Michael van Ouwerkerk, 2014/12/11 16:41:55]

So I'm no longer sure we need an https server, as localhost should be considered
secure. I struggled with a security exception, but I think in the end it was
really about the mime type with which the service worker was served.

[Peter Beverloo, 2014/12/11 19:02:00]

Technically we don't, the code works perfectly fine when we use a HTTP server.
(127.0.0.1 indeed is recognized as a secure origin.)

However, with the world moving the HTTPS, I'm not sure whether using HTTP over
HTTPS really makes sense. The overhead of HTTPS not measurable, so I'd rather
keep it as-is right now.

+      net::SpawnedTestServer::TYPE_HTTPS,
+      net::BaseTestServer::SSLOptions(
+          net::BaseTestServer::SSLOptions::CERT_OK),
+      base::FilePath(FILE_PATH_LITERAL("chrome/test/data/"))));
+  ASSERT_TRUE(https_server_->Start());
+
+  service()->SetNotificationUIManagerForTesting(ui_manager_.get());
+
+  InProcessBrowserTest::SetUp();
+}
+
+void PlatformNotificationServiceBrowserTest::SetUpOnMainThread() {
+  NavigateToTestPage(kTestPageUrl);
+
+  InProcessBrowserTest::SetUpOnMainThread();
+}
+
+void PlatformNotificationServiceBrowserTest::TearDown() {
+  service()->SetNotificationUIManagerForTesting(nullptr);
+
+  ui_manager_.reset();

[Michael van Ouwerkerk, 2014/12/11 16:41:55]

I'm not sure I understand this correctly. These are both scoped_ptr, why do you
need to manually reset them?

[Peter Beverloo, 2014/12/11 19:02:00]

Precedence in a certain other browser test :-). I removed them, as there's no
strict need, and they mainly satisfied my mental image about cleaning up after
oneself.

+  https_server_.reset();
+}
+
+void PlatformNotificationServiceBrowserTest::NavigateToTestPage(
+    const std::string& path) const {
+  ui_test_utils::NavigateToURL(browser(), https_server_->GetURL(path));
+}
+
+bool PlatformNotificationServiceBrowserTest::RunScript(
+    const std::string& script, std::string* result) const {
+  return content::ExecuteScriptAndExtractString(
+      browser()->tab_strip_model()->GetActiveWebContents()->GetMainFrame(),
+      script,
+      result);
+}
+
+// -----------------------------------------------------------------------------
+
+// TODO(peter): Move PlatformNotificationService-related tests over from
+// notification_browsertest.cc to this file.
+
+IN_PROC_BROWSER_TEST_F(PlatformNotificationServiceBrowserTest,
+                       DisplayPersistentNotificationWithoutPermission) {
+  std::string script_result;
+
+  InfoBarResponder accepting_responder(browser(), false);
+  ASSERT_TRUE(RunScript("RequestPermission()", &script_result));
+  EXPECT_EQ("denied", script_result);
+
+  ASSERT_TRUE(RunScript("DisplayPersistentNotification()", &script_result));
+  EXPECT_EQ(
+      "TypeError: No notification permission has been granted for this origin.",
+      script_result);
+
+  ASSERT_EQ(0u, ui_manager()->GetNotificationCount());
+}
+
+IN_PROC_BROWSER_TEST_F(PlatformNotificationServiceBrowserTest,
+                       DisplayPersistentNotificationWithPermission) {
+  std::string script_result;
+
+  InfoBarResponder accepting_responder(browser(), true);
+  ASSERT_TRUE(RunScript("RequestPermission()", &script_result));
+  EXPECT_EQ("granted", script_result);
+
+  ASSERT_TRUE(RunScript("DisplayPersistentNotification('action_none')",
+       &script_result));
+  EXPECT_EQ("ok", script_result);
+
+  ASSERT_EQ(1u, ui_manager()->GetNotificationCount());
+
+  const Notification& notification = ui_manager()->GetNotificationAt(0);
+  notification.delegate()->Click();
+
+  ASSERT_TRUE(RunScript("GetMessageFromWorker()", &script_result));
+  EXPECT_EQ("action_none", script_result);
+
+  ASSERT_EQ(1u, ui_manager()->GetNotificationCount());
+}
+
+IN_PROC_BROWSER_TEST_F(PlatformNotificationServiceBrowserTest,
+                       CloseDisplayedPersistentNotification) {
+  std::string script_result;
+
+  InfoBarResponder accepting_responder(browser(), true);
+  ASSERT_TRUE(RunScript("RequestPermission()", &script_result));
+  EXPECT_EQ("granted", script_result);
+
+  ASSERT_TRUE(RunScript("DisplayPersistentNotification('action_close')",
+      &script_result));
+  EXPECT_EQ("ok", script_result);
+
+  ASSERT_EQ(1u, ui_manager()->GetNotificationCount());
+
+  const Notification& notification = ui_manager()->GetNotificationAt(0);
+  notification.delegate()->Click();
+
+  ASSERT_TRUE(RunScript("GetMessageFromWorker()", &script_result));
+  EXPECT_EQ("action_close", script_result);
+
+  ASSERT_EQ(0u, ui_manager()->GetNotificationCount());
+}