OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include <map> | 5 #include <map> |
6 #include <string> | 6 #include <string> |
7 | 7 |
8 #include "base/barrier_closure.h" | 8 #include "base/barrier_closure.h" |
9 #include "base/bind.h" | 9 #include "base/bind.h" |
10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
(...skipping 225 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
236 }; | 236 }; |
237 | 237 |
238 void PushMessagingBrowserTest::RequestAndAcceptPermission() { | 238 void PushMessagingBrowserTest::RequestAndAcceptPermission() { |
239 std::string script_result; | 239 std::string script_result; |
240 | 240 |
241 if (PermissionBubbleManager::Enabled()) { | 241 if (PermissionBubbleManager::Enabled()) { |
242 GetPermissionBubbleManager()->set_auto_response_for_test( | 242 GetPermissionBubbleManager()->set_auto_response_for_test( |
243 PermissionBubbleManager::ACCEPT_ALL); | 243 PermissionBubbleManager::ACCEPT_ALL); |
244 EXPECT_TRUE(RunScript("requestNotificationPermission();", &script_result)); | 244 EXPECT_TRUE(RunScript("requestNotificationPermission();", &script_result)); |
245 } else { | 245 } else { |
246 InfoBarResponder infobar_accept_responder(GetInfoBarService(), true); | 246 InfoBarResponder infobar_accept_responder(GetInfoBarService(), |
| 247 InfoBarResponder::ACCEPT); |
247 EXPECT_TRUE(RunScript("requestNotificationPermission();", &script_result)); | 248 EXPECT_TRUE(RunScript("requestNotificationPermission();", &script_result)); |
248 } | 249 } |
249 EXPECT_EQ("permission status - granted", script_result); | 250 EXPECT_EQ("permission status - granted", script_result); |
250 } | 251 } |
251 | 252 |
252 void PushMessagingBrowserTest::RequestAndDenyPermission() { | 253 void PushMessagingBrowserTest::RequestAndDenyPermission() { |
253 std::string script_result; | 254 std::string script_result; |
254 | 255 |
255 if (PermissionBubbleManager::Enabled()) { | 256 if (PermissionBubbleManager::Enabled()) { |
256 GetPermissionBubbleManager()->set_auto_response_for_test( | 257 GetPermissionBubbleManager()->set_auto_response_for_test( |
257 PermissionBubbleManager::DENY_ALL); | 258 PermissionBubbleManager::DENY_ALL); |
258 EXPECT_TRUE(RunScript("requestNotificationPermission();", &script_result)); | 259 EXPECT_TRUE(RunScript("requestNotificationPermission();", &script_result)); |
259 } else { | 260 } else { |
260 InfoBarResponder infobar_deny_responder(GetInfoBarService(), false); | 261 InfoBarResponder infobar_deny_responder(GetInfoBarService(), |
| 262 InfoBarResponder::DENY); |
261 EXPECT_TRUE(RunScript("requestNotificationPermission();", &script_result)); | 263 EXPECT_TRUE(RunScript("requestNotificationPermission();", &script_result)); |
262 } | 264 } |
263 EXPECT_EQ("permission status - denied", script_result); | 265 EXPECT_EQ("permission status - denied", script_result); |
264 } | 266 } |
265 | 267 |
266 void PushMessagingBrowserTest::TryToSubscribeSuccessfully( | 268 void PushMessagingBrowserTest::TryToSubscribeSuccessfully( |
267 const std::string& expected_push_subscription_id) { | 269 const std::string& expected_push_subscription_id) { |
268 std::string script_result; | 270 std::string script_result; |
269 | 271 |
270 EXPECT_TRUE(RunScript("registerServiceWorker()", &script_result)); | 272 EXPECT_TRUE(RunScript("registerServiceWorker()", &script_result)); |
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
312 std::string script_result; | 314 std::string script_result; |
313 | 315 |
314 ASSERT_TRUE(RunScript("registerServiceWorker()", &script_result)); | 316 ASSERT_TRUE(RunScript("registerServiceWorker()", &script_result)); |
315 ASSERT_EQ("ok - service worker registered", script_result); | 317 ASSERT_EQ("ok - service worker registered", script_result); |
316 | 318 |
317 if (PermissionBubbleManager::Enabled()) { | 319 if (PermissionBubbleManager::Enabled()) { |
318 GetPermissionBubbleManager()->set_auto_response_for_test( | 320 GetPermissionBubbleManager()->set_auto_response_for_test( |
319 PermissionBubbleManager::ACCEPT_ALL); | 321 PermissionBubbleManager::ACCEPT_ALL); |
320 ASSERT_TRUE(RunScript("subscribePush()", &script_result)); | 322 ASSERT_TRUE(RunScript("subscribePush()", &script_result)); |
321 } else { | 323 } else { |
322 InfoBarResponder infobar_accept_responder(GetInfoBarService(), true); | 324 InfoBarResponder infobar_accept_responder(GetInfoBarService(), |
| 325 InfoBarResponder::ACCEPT); |
323 ASSERT_TRUE(RunScript("subscribePush()", &script_result)); | 326 ASSERT_TRUE(RunScript("subscribePush()", &script_result)); |
324 } | 327 } |
325 EXPECT_EQ(GetEndpointForSubscriptionId("1-0"), script_result); | 328 EXPECT_EQ(GetEndpointForSubscriptionId("1-0"), script_result); |
326 | 329 |
327 PushMessagingAppIdentifier app_identifier = | 330 PushMessagingAppIdentifier app_identifier = |
328 GetAppIdentifierForServiceWorkerRegistration(0LL); | 331 GetAppIdentifierForServiceWorkerRegistration(0LL); |
329 EXPECT_EQ(app_identifier.app_id(), gcm_service()->last_registered_app_id()); | 332 EXPECT_EQ(app_identifier.app_id(), gcm_service()->last_registered_app_id()); |
330 EXPECT_EQ("1234567890", gcm_service()->last_registered_sender_ids()[0]); | 333 EXPECT_EQ("1234567890", gcm_service()->last_registered_sender_ids()[0]); |
331 } | 334 } |
332 | 335 |
(...skipping 825 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1158 ASSERT_TRUE(RunScript("hasSubscription()", &script_result)); | 1161 ASSERT_TRUE(RunScript("hasSubscription()", &script_result)); |
1159 ASSERT_EQ("false - not subscribed", script_result); | 1162 ASSERT_EQ("false - not subscribed", script_result); |
1160 } | 1163 } |
1161 | 1164 |
1162 INSTANTIATE_TEST_CASE_P(PushMessagingBrowserTestWithParams, | 1165 INSTANTIATE_TEST_CASE_P(PushMessagingBrowserTestWithParams, |
1163 PushMessagingBrowserTest, | 1166 PushMessagingBrowserTest, |
1164 testing::Values(true, false)); | 1167 testing::Values(true, false)); |
1165 INSTANTIATE_TEST_CASE_P(PushMessagingIncognitoBrowserTestWithParams, | 1168 INSTANTIATE_TEST_CASE_P(PushMessagingIncognitoBrowserTestWithParams, |
1166 PushMessagingIncognitoBrowserTest, | 1169 PushMessagingIncognitoBrowserTest, |
1167 testing::Values(true, false)); | 1170 testing::Values(true, false)); |
OLD | NEW |