| 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 <stddef.h> | 5 #include <stddef.h> |
| 6 #include <stdint.h> | 6 #include <stdint.h> |
| 7 | 7 |
| 8 #include <map> | 8 #include <map> |
| 9 #include <string> | 9 #include <string> |
| 10 | 10 |
| (...skipping 493 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 504 ASSERT_TRUE(RunScript("registerServiceWorker()", &script_result)); | 504 ASSERT_TRUE(RunScript("registerServiceWorker()", &script_result)); |
| 505 ASSERT_EQ("ok - service worker registered", script_result); | 505 ASSERT_EQ("ok - service worker registered", script_result); |
| 506 | 506 |
| 507 ASSERT_NO_FATAL_FAILURE(RequestAndAcceptPermission()); | 507 ASSERT_NO_FATAL_FAILURE(RequestAndAcceptPermission()); |
| 508 | 508 |
| 509 ASSERT_TRUE(RunScript("documentSubscribePush()", &script_result)); | 509 ASSERT_TRUE(RunScript("documentSubscribePush()", &script_result)); |
| 510 EXPECT_EQ("NotAllowedError - Registration failed - permission denied", | 510 EXPECT_EQ("NotAllowedError - Registration failed - permission denied", |
| 511 script_result); | 511 script_result); |
| 512 } | 512 } |
| 513 | 513 |
| 514 IN_PROC_BROWSER_TEST_F(PushMessagingBrowserTest, SubscribeWorker) { | 514 // Flaky on ChromeOS and Linux. See http://crbug.com/657202. |
| 515 #if defined(OS_CHROMEOS) || defined(OS_LINUX) |
| 516 #define MAYBE_SubscribeWorker DISABLED_SubscribeWorker |
| 517 #else |
| 518 #define MAYBE_SubscribeWorker SubscribeWorker |
| 519 #endif |
| 520 IN_PROC_BROWSER_TEST_F(PushMessagingBrowserTest, MAYBE_SubscribeWorker) { |
| 515 std::string script_result; | 521 std::string script_result; |
| 516 | 522 |
| 517 ASSERT_TRUE(RunScript("registerServiceWorker()", &script_result)); | 523 ASSERT_TRUE(RunScript("registerServiceWorker()", &script_result)); |
| 518 ASSERT_EQ("ok - service worker registered", script_result); | 524 ASSERT_EQ("ok - service worker registered", script_result); |
| 519 | 525 |
| 520 ASSERT_NO_FATAL_FAILURE(RequestAndAcceptPermission()); | 526 ASSERT_NO_FATAL_FAILURE(RequestAndAcceptPermission()); |
| 521 | 527 |
| 522 LoadTestPage(); // Reload to become controlled. | 528 LoadTestPage(); // Reload to become controlled. |
| 523 | 529 |
| 524 ASSERT_TRUE(RunScript("isControlled()", &script_result)); | 530 ASSERT_TRUE(RunScript("isControlled()", &script_result)); |
| (...skipping 22 matching lines...) Expand all Loading... |
| 547 std::string token2; | 553 std::string token2; |
| 548 ASSERT_NO_FATAL_FAILURE( | 554 ASSERT_NO_FATAL_FAILURE( |
| 549 EndpointToToken(script_result, true /* standard_protocol */, &token2)); | 555 EndpointToToken(script_result, true /* standard_protocol */, &token2)); |
| 550 EXPECT_NE(token1, token2); | 556 EXPECT_NE(token1, token2); |
| 551 | 557 |
| 552 ASSERT_TRUE(RunScript("unsubscribePush()", &script_result)); | 558 ASSERT_TRUE(RunScript("unsubscribePush()", &script_result)); |
| 553 EXPECT_EQ("unsubscribe result: true", script_result); | 559 EXPECT_EQ("unsubscribe result: true", script_result); |
| 554 EXPECT_NE(push_service(), GetAppHandler()); | 560 EXPECT_NE(push_service(), GetAppHandler()); |
| 555 } | 561 } |
| 556 | 562 |
| 557 IN_PROC_BROWSER_TEST_F(PushMessagingBrowserTest, SubscribeWorkerUsingManifest) { | 563 // Flaky on ChromeOS and Linux. See http://crbug.com/657202. |
| 564 #if defined(OS_CHROMEOS) || defined(OS_LINUX) |
| 565 #define MAYBE_SubscribeWorkerUsingManifest DISABLED_SubscribeWorkerUsingManifest |
| 566 #else |
| 567 #define MAYBE_SubscribeWorkerUsingManifest SubscribeWorkerUsingManifest |
| 568 #endif |
| 569 IN_PROC_BROWSER_TEST_F(PushMessagingBrowserTest, |
| 570 MAYBE_SubscribeWorkerUsingManifest) { |
| 558 std::string script_result; | 571 std::string script_result; |
| 559 | 572 |
| 560 ASSERT_TRUE(RunScript("registerServiceWorker()", &script_result)); | 573 ASSERT_TRUE(RunScript("registerServiceWorker()", &script_result)); |
| 561 ASSERT_EQ("ok - service worker registered", script_result); | 574 ASSERT_EQ("ok - service worker registered", script_result); |
| 562 | 575 |
| 563 ASSERT_NO_FATAL_FAILURE(RequestAndAcceptPermission()); | 576 ASSERT_NO_FATAL_FAILURE(RequestAndAcceptPermission()); |
| 564 | 577 |
| 565 LoadTestPage(); // Reload to become controlled. | 578 LoadTestPage(); // Reload to become controlled. |
| 566 | 579 |
| 567 ASSERT_TRUE(RunScript("isControlled()", &script_result)); | 580 ASSERT_TRUE(RunScript("isControlled()", &script_result)); |
| (...skipping 1301 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1869 ASSERT_NO_FATAL_FAILURE(SubscribeSuccessfully()); | 1882 ASSERT_NO_FATAL_FAILURE(SubscribeSuccessfully()); |
| 1870 ASSERT_FALSE(background_mode_manager->IsBackgroundModeActive()); | 1883 ASSERT_FALSE(background_mode_manager->IsBackgroundModeActive()); |
| 1871 | 1884 |
| 1872 // After dropping the last subscription background mode is still inactive. | 1885 // After dropping the last subscription background mode is still inactive. |
| 1873 std::string script_result; | 1886 std::string script_result; |
| 1874 ASSERT_TRUE(RunScript("unsubscribePush()", &script_result)); | 1887 ASSERT_TRUE(RunScript("unsubscribePush()", &script_result)); |
| 1875 EXPECT_EQ("unsubscribe result: true", script_result); | 1888 EXPECT_EQ("unsubscribe result: true", script_result); |
| 1876 ASSERT_FALSE(background_mode_manager->IsBackgroundModeActive()); | 1889 ASSERT_FALSE(background_mode_manager->IsBackgroundModeActive()); |
| 1877 } | 1890 } |
| 1878 #endif // BUILDFLAG(ENABLE_BACKGROUND) && !defined(OS_CHROMEOS) | 1891 #endif // BUILDFLAG(ENABLE_BACKGROUND) && !defined(OS_CHROMEOS) |
| OLD | NEW |