[PUSH] Merge notifications and push messaging prompts

chrome/browser/services/gcm/push_messaging_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 <map>
 #include <string>
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 122 matching lines @@
   }
 
  private:
   scoped_ptr<net::SpawnedTestServer> https_server_;
   FakeGCMProfileService* gcm_service_;
 
   DISALLOW_COPY_AND_ASSIGN(PushMessagingBrowserTest);
 };
 
 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);
 
   PushMessagingApplicationId app_id(https_server()->GetURL(""), 0L);
   EXPECT_EQ(app_id.ToString(), gcm_service()->last_registered_app_id());
   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);
 
-  InfoBarResponder cancelling_responder(browser(), false);
-
   ASSERT_TRUE(RunScript("registerPush()", &script_result));
   EXPECT_EQ("AbortError - Registration failed - permission denied",
             script_result);
 }
 
 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);
 
   ASSERT_TRUE(RunScript("registerPush()", &script_result));
   EXPECT_EQ("AbortError - Registration failed - no sender id provided",
             script_result);
 }
 
 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);
 
   PushMessagingApplicationId app_id(https_server()->GetURL(""), 0L);
   EXPECT_EQ(app_id.ToString(), gcm_service()->last_registered_app_id());
   EXPECT_EQ("1234567890", gcm_service()->last_registered_sender_ids()[0]);
 
   ASSERT_TRUE(RunScript("isControlled()", &script_result));
   ASSERT_EQ("false - is not controlled", script_result);
 
   loadTestPage();  // Reload to become controlled.
 
   ASSERT_TRUE(RunScript("isControlled()", &script_result));
   ASSERT_EQ("true - is controlled", script_result);
 
   GCMClient::IncomingMessage message;
   GCMClient::MessageData messageData;
   messageData.insert(std::pair<std::string, std::string>("data", "testdata"));
   message.data = messageData;
   push_service()->OnMessage(app_id.ToString(), message);
   ASSERT_TRUE(RunScript("pushData.get()", &script_result));
   EXPECT_EQ("testdata", script_result);
 }
 
 }  // namespace gcm