Check the format of an applicationServerKey when used to register a push subscription.

chrome/browser/push_messaging/push_messaging_browsertest.cc

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 c7ee2155c33fedb96698bc0c97ee59a4d21bd150..f8fe4300e8d53341f929108b217d7e3527a36e28 100644
--- a/chrome/browser/push_messaging/push_messaging_browsertest.cc
+++ b/chrome/browser/push_messaging/push_messaging_browsertest.cc
@@ -447,7 +447,56 @@ IN_PROC_BROWSER_TEST_F(PushMessagingBrowserTest,
   GetAppIdentifierForServiceWorkerRegistration(0LL);
 }
 
-IN_PROC_BROWSER_TEST_F(PushMessagingBrowserTest, SubscribeFailureBadKey) {
+IN_PROC_BROWSER_TEST_F(PushMessagingBrowserTest,
+                       SubscribeSuccessValidSenderID) {
+  std::string script_result;
+
+  ASSERT_TRUE(RunScript("registerServiceWorker()", &script_result));
+  ASSERT_EQ("ok - service worker registered", script_result);
+
+  ASSERT_NO_FATAL_FAILURE(RequestAndAcceptPermission());
+
+  ASSERT_TRUE(
+      RunScript("documentSubscribePushValidSenderId()", &script_result));
+
+  // Subscriptions with a sender ID instead of a VAPID key should be given the
+  // non-VAPID endpoint, even if the sender ID was passed to the subscribe
+  // call.
+  ASSERT_NO_FATAL_FAILURE(EndpointToToken(script_result, false));
+}
+
+IN_PROC_BROWSER_TEST_F(PushMessagingBrowserTest, SubscribeFailureLongKey) {

[Peter Beverloo, 2016/10/11 15:10:41]

The following three tests should be layout tests.

In general, we use layout tests for all Web Exposed behaviour unless we
really can't, for example because it's depending on mocked behaviour.

That's not the case here -- the exception is thrown by Blink, and can be
observed by layout tests directly.

[harkness, 2016/10/14 13:53:55]

Done.

+  std::string script_result;
+
+  ASSERT_TRUE(RunScript("registerServiceWorker()", &script_result));
+  ASSERT_EQ("ok - service worker registered", script_result);
+
+  ASSERT_NO_FATAL_FAILURE(RequestAndAcceptPermission());
+
+  ASSERT_TRUE(RunScript("documentSubscribePushLongKey()", &script_result));
+  EXPECT_EQ(
+      "InvalidAccessError - Failed to execute 'subscribe' on 'PushManager': "
+      "The provided applicationServerKey is not valid.",
+      script_result);
+}
+
+IN_PROC_BROWSER_TEST_F(PushMessagingBrowserTest, SubscribeFailureShortKey) {
+  std::string script_result;
+
+  ASSERT_TRUE(RunScript("registerServiceWorker()", &script_result));
+  ASSERT_EQ("ok - service worker registered", script_result);
+
+  ASSERT_NO_FATAL_FAILURE(RequestAndAcceptPermission());
+
+  ASSERT_TRUE(RunScript("documentSubscribePushShortKey()", &script_result));
+  EXPECT_EQ(
+      "InvalidAccessError - Failed to execute 'subscribe' on 'PushManager': "
+      "The provided applicationServerKey is not valid.",
+      script_result);
+}
+
+IN_PROC_BROWSER_TEST_F(PushMessagingBrowserTest,
+                       SubscribeFailureNonNumericKey) {
   std::string script_result;
 
   ASSERT_TRUE(RunScript("registerServiceWorker()", &script_result));
@@ -455,7 +504,8 @@ IN_PROC_BROWSER_TEST_F(PushMessagingBrowserTest, SubscribeFailureBadKey) {
 
   ASSERT_NO_FATAL_FAILURE(RequestAndAcceptPermission());
 
-  ASSERT_TRUE(RunScript("documentSubscribePushBadKey()", &script_result));
+  ASSERT_TRUE(
+      RunScript("documentSubscribePushNonNumericKey()", &script_result));
   EXPECT_EQ(
       "InvalidAccessError - Failed to execute 'subscribe' on 'PushManager': "
       "The provided applicationServerKey is not valid.",