[PUSH] Merge notifications and push messaging prompts

chrome/browser/services/gcm/push_messaging_browsertest.cc

Index: chrome/browser/services/gcm/push_messaging_browsertest.cc
diff --git a/chrome/browser/services/gcm/push_messaging_browsertest.cc b/chrome/browser/services/gcm/push_messaging_browsertest.cc
index d9ab8cb4cfdf218693275a95e60bccec7387bf7c..c9ae36012860c82cf8ccd5caec6b86deaed4e97a 100644
--- a/chrome/browser/services/gcm/push_messaging_browsertest.cc
+++ b/chrome/browser/services/gcm/push_messaging_browsertest.cc
@@ -141,12 +141,12 @@ class PushMessagingBrowserTest : public InProcessBrowserTest {
 
 IN_PROC_BROWSER_TEST_F(PushMessagingBrowserTest, RegisterSuccess) {
   std::string script_result;

[Michael van Ouwerkerk, 2014/11/13 18:35:51]

Nit: newline after this.

[Miguel Garcia, 2014/11/14 11:34:35]

Done.

-
+  InfoBarResponder accepting_responder(browser(), true);

[johnme, 2014/11/13 18:50:06]

Nit: it's probably more idiomatic to call registerServiceWorker before
requestPermission, since webapps should work offline whether or not push
notifications is enabled. Ditto elsewhere.

[Miguel Garcia, 2014/11/14 11:34:35]

Done.

+  ASSERT_TRUE(RunScript("requestPermission();", &script_result));

[Michael van Ouwerkerk, 2014/11/13 18:35:51]

Nit: you can omit the semicolon after requestPermission() - it's cleaner.

[Miguel Garcia, 2014/11/14 11:34:35]

Done.

+  ASSERT_EQ("permission status - granted", script_result);

[Michael van Ouwerkerk, 2014/11/13 18:35:51]

Nit: insert newline after this.

[Miguel Garcia, 2014/11/14 11:34:35]

Done.

   ASSERT_TRUE(RunScript("registerServiceWorker()", &script_result));
   ASSERT_EQ("ok - service worker registered", script_result);
 
-  InfoBarResponder accepting_responder(browser(), true);
-
   ASSERT_TRUE(RunScript("registerPush()", &script_result));
   EXPECT_EQ(std::string(kPushMessagingEndpoint) + " - 1", script_result);
 
@@ -155,14 +155,28 @@ IN_PROC_BROWSER_TEST_F(PushMessagingBrowserTest, RegisterSuccess) {
   EXPECT_EQ("1234567890", gcm_service()->last_registered_sender_ids()[0]);
 }
 
-IN_PROC_BROWSER_TEST_F(PushMessagingBrowserTest, RegisterFailureNoPermission) {
+IN_PROC_BROWSER_TEST_F(PushMessagingBrowserTest,
+                       RegisterFailureNoPushPermission) {
   std::string script_result;

[Michael van Ouwerkerk, 2014/11/13 18:35:51]

Nit: newline after this.

[Miguel Garcia, 2014/11/14 11:34:35]

Done.

-
   ASSERT_TRUE(RunScript("registerServiceWorker()", &script_result));
   ASSERT_EQ("ok - service worker registered", script_result);
 
+  ASSERT_TRUE(RunScript("registerPush()", &script_result));
+  EXPECT_EQ("AbortError - Registration failed - permission denied",
+            script_result);
+}
+
+IN_PROC_BROWSER_TEST_F(PushMessagingBrowserTest,
+                       RegisterFailureNotificationsBlocked) {
+  std::string script_result;

[Michael van Ouwerkerk, 2014/11/13 18:35:51]

Nit: newline after this.

[Miguel Garcia, 2014/11/14 11:34:36]

Done.

   InfoBarResponder cancelling_responder(browser(), false);
 
+  ASSERT_TRUE(RunScript("requestPermission();", &script_result));
+  ASSERT_EQ("permission status - denied", script_result);
+
+  ASSERT_TRUE(RunScript("registerServiceWorker()", &script_result));
+  ASSERT_EQ("ok - service worker registered", script_result);
+
   ASSERT_TRUE(RunScript("registerPush()", &script_result));
   EXPECT_EQ("AbortError - Registration failed - permission denied",
             script_result);
@@ -171,11 +185,13 @@ IN_PROC_BROWSER_TEST_F(PushMessagingBrowserTest, RegisterFailureNoPermission) {
 IN_PROC_BROWSER_TEST_F(PushMessagingBrowserTest, RegisterFailureNoSenderId) {
   std::string script_result;
 
+  InfoBarResponder accepting_responder(browser(), true);
+  ASSERT_TRUE(RunScript("requestPermission();", &script_result));
+  ASSERT_EQ("permission status - granted", script_result);
+
   ASSERT_TRUE(RunScript("registerServiceWorker()", &script_result));
   ASSERT_EQ("ok - service worker registered", script_result);
 
-  InfoBarResponder accepting_responder(browser(), true);
-
   ASSERT_TRUE(RunScript("removeManifest()", &script_result));
   ASSERT_EQ("manifest removed", script_result);
 
@@ -186,12 +202,12 @@ IN_PROC_BROWSER_TEST_F(PushMessagingBrowserTest, RegisterFailureNoSenderId) {
 
 IN_PROC_BROWSER_TEST_F(PushMessagingBrowserTest, PushEventSuccess) {
   std::string script_result;

[Michael van Ouwerkerk, 2014/11/13 18:35:51]

Nit: insert newline after this.

[Miguel Garcia, 2014/11/14 11:34:35]

Done.

+  InfoBarResponder accepting_responder(browser(), true);
+  ASSERT_TRUE(RunScript("requestPermission();", &script_result));

[Michael van Ouwerkerk, 2014/11/13 18:35:51]

Insert after this:
ASSERT_EQ("permission status - granted", script_result);

[Miguel Garcia, 2014/11/14 11:34:35]

Done.

 
   ASSERT_TRUE(RunScript("registerServiceWorker()", &script_result));
   ASSERT_EQ("ok - service worker registered", script_result);
 
-  InfoBarResponder accepting_responder(browser(), true);
-
   ASSERT_TRUE(RunScript("registerPush()", &script_result));
   EXPECT_EQ(std::string(kPushMessagingEndpoint) + " - 1", script_result);