Adds a context message of the security origin for web notifications.

chrome/browser/notifications/platform_notification_service_browsertest.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 <string>
 
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/memory/scoped_ptr.h"
+#include "base/strings/utf_string_conversions.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/base/filename_util.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 imitate the behavior of a user.
 // TODO(peter): Generalize this class, as it's commonly useful.
 class InfoBarResponder : public infobars::InfoBarManager::Observer {
  public:
   InfoBarResponder(Browser* browser, bool accept);
@@ skipping 42 matching lines @@
   if (accept_)
     delegate->Accept();
   else
     delegate->Cancel();
 }
 
 // -----------------------------------------------------------------------------
 
 class PlatformNotificationServiceBrowserTest : public InProcessBrowserTest {
  public:
+  PlatformNotificationServiceBrowserTest();
   ~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(); }
 
+  const base::FilePath& server_root() const { return server_root_; }
+
   // 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 script was executed successfully.
   bool RunScript(const std::string& script, std::string* result) const;
 
+  net::HostPortPair ServerHostPort() const;
+
  private:
+  const base::FilePath server_root_;
   scoped_ptr<StubNotificationUIManager> ui_manager_;
   scoped_ptr<net::SpawnedTestServer> https_server_;
 };
 
 // -----------------------------------------------------------------------------
 
 namespace {
 
-const char kTestPageUrl[] =
-    "files/notifications/platform_notification_service.html";
+const char kTestFileName[] = "notifications/platform_notification_service.html";
+}  // namespace

[Peter Beverloo, 2015/01/27 13:37:04]

micro nit:

namespace {
const char kTestFileName[] = "notifications/platform_notification_service.html";
}

[-blank line, -comment]

[dewittj, 2015/01/27 23:10:12]

Done.

 
-}  // namespace
+PlatformNotificationServiceBrowserTest::PlatformNotificationServiceBrowserTest()
+    : server_root_(FILE_PATH_LITERAL("chrome/test/data")) {
+}
 
 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(
       net::SpawnedTestServer::TYPE_HTTPS,
-      net::BaseTestServer::SSLOptions(
-          net::BaseTestServer::SSLOptions::CERT_OK),
-      base::FilePath(FILE_PATH_LITERAL("chrome/test/data/"))));
+      net::BaseTestServer::SSLOptions(net::BaseTestServer::SSLOptions::CERT_OK),
+      server_root_));
   ASSERT_TRUE(https_server_->Start());
 
   service()->SetNotificationUIManagerForTesting(ui_manager_.get());
 
   InProcessBrowserTest::SetUp();
 }
 
 void PlatformNotificationServiceBrowserTest::SetUpOnMainThread() {
-  NavigateToTestPage(kTestPageUrl);
+  // The test server has a base directory that doesn't exist in the
+  // filesystem.
+  std::string test_page_url = std::string("files/") + kTestFileName;
+
+  NavigateToTestPage(test_page_url);
 
   InProcessBrowserTest::SetUpOnMainThread();
 }
 
 void PlatformNotificationServiceBrowserTest::TearDown() {
   service()->SetNotificationUIManagerForTesting(nullptr);
 }
 
 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);
 }
 
+net::HostPortPair PlatformNotificationServiceBrowserTest::ServerHostPort()
+    const {
+  return https_server_->host_port_pair();
+}
+
 // -----------------------------------------------------------------------------
 
 // 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);
@@ skipping 46 matching lines @@
   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());
 }
+
+IN_PROC_BROWSER_TEST_F(PlatformNotificationServiceBrowserTest,
+                       TestDisplayOriginContextMessage) {
+  std::string script_result;
+
+  // Creates a simple notification.
+  InfoBarResponder accepting_responder(browser(), true);
+  ASSERT_TRUE(RunScript("RequestPermission()", &script_result));
+  ASSERT_EQ("granted", script_result);
+  ASSERT_TRUE(RunScript("DisplayPersistentNotification()", &script_result));
+
+  net::HostPortPair host_port = ServerHostPort();
+
+  const Notification& notification = ui_manager()->GetNotificationAt(0);
+
+  EXPECT_EQ(base::UTF8ToUTF16(host_port.ToString()),
+            notification.context_message());
+}
+
+IN_PROC_BROWSER_TEST_F(PlatformNotificationServiceBrowserTest,
+                       CheckFilePermissionNotGranted) {
+  base::FilePath full_file_path =
+      server_root().Append(base::FilePath::FromUTF8Unsafe(kTestFileName));
+  GURL file_url(net::FilePathToFileURL(full_file_path));

[Peter Beverloo, 2015/01/27 13:37:04]

QQ: If server_root_ is "chrome/test/data" (which is relative) and
url::FilePathToFileURL prepends file:// and the CHDIR, which is the location of
the "chrome" binary, how do we end up being able to load the test file? Do we
create a symlink somewhere?

[dewittj, 2015/01/27 23:10:12]

Right, looks like the try bots failed on that.  It worked on my development
machine because the current directory happened to be the source root.

+  ui_test_utils::NavigateToURL(browser(), file_url);
+
+  std::string script_result;
+
+  InfoBarResponder accepting_responder(browser(), true);
+
+  // TODO(dewittj): Update the
+  // |PlatformNotificationServiceImpl::WebOriginDisplayName| function to
+  // properly display file:// URL origins.  See crbug.com/402191.
+  ASSERT_TRUE(RunScript("RequestPermission()", &script_result));
+  EXPECT_EQ("default", script_result)
+      << "If this test fails, you may have fixed a bug preventing file origins "
+      << "from sending their origin from Blink; if so you need to update the "
+      << "display function for notification origins to show the file path.";
+}