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"
@@ skipping 78 matching lines @@
   // 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 script was executed successfully.
   bool RunScript(const std::string& script, std::string* result) const;
 
+  net::HostPortPair ServerHostPort() const;
+
  private:
   scoped_ptr<StubNotificationUIManager> ui_manager_;
   scoped_ptr<net::SpawnedTestServer> https_server_;
 };
 
 // -----------------------------------------------------------------------------
 
 namespace {
 
 const char kTestPageUrl[] =
@@ skipping 39 matching lines @@
 }
 
 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());
+}