| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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 <stdint.h> | 5 #include <stdint.h> |
| 6 | 6 |
| 7 #include "base/bind_helpers.h" | 7 #include "base/bind_helpers.h" |
| 8 #include "base/macros.h" | 8 #include "base/macros.h" |
| 9 #include "base/strings/stringprintf.h" | 9 #include "base/strings/stringprintf.h" |
| 10 #include "base/strings/utf_string_conversions.h" | 10 #include "base/strings/utf_string_conversions.h" |
| (...skipping 679 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 690 | 690 |
| 691 std::string value; | 691 std::string value; |
| 692 ASSERT_TRUE( | 692 ASSERT_TRUE( |
| 693 content::ExecuteScriptAndExtractString(tab, "register();", &value)); | 693 content::ExecuteScriptAndExtractString(tab, "register();", &value)); |
| 694 EXPECT_EQ("SW controlled", value); | 694 EXPECT_EQ("SW controlled", value); |
| 695 | 695 |
| 696 ASSERT_TRUE(RunExtensionTest("service_worker/content_script_fetch")) | 696 ASSERT_TRUE(RunExtensionTest("service_worker/content_script_fetch")) |
| 697 << message_; | 697 << message_; |
| 698 } | 698 } |
| 699 | 699 |
| 700 IN_PROC_BROWSER_TEST_F(ServiceWorkerPushMessagingTest, OnPush) { | 700 // Flaky on ChromiumOS bots. http://crbug.com/612673 |
| 701 #if defined(OS_CHROMEOS) |
| 702 #define MAYBE_OnPush DISABLED_OnPush |
| 703 #else |
| 704 #define MAYBE_OnPush OnPush |
| 705 #endif |
| 706 IN_PROC_BROWSER_TEST_F(ServiceWorkerPushMessagingTest, MAYBE_OnPush) { |
| 701 const Extension* extension = LoadExtensionWithFlags( | 707 const Extension* extension = LoadExtensionWithFlags( |
| 702 test_data_dir_.AppendASCII("service_worker/push_messaging"), kFlagNone); | 708 test_data_dir_.AppendASCII("service_worker/push_messaging"), kFlagNone); |
| 703 ASSERT_TRUE(extension); | 709 ASSERT_TRUE(extension); |
| 704 GURL extension_url = extension->url(); | 710 GURL extension_url = extension->url(); |
| 705 | 711 |
| 706 ASSERT_NO_FATAL_FAILURE(GrantNotificationPermissionForTest(extension_url)); | 712 ASSERT_NO_FATAL_FAILURE(GrantNotificationPermissionForTest(extension_url)); |
| 707 | 713 |
| 708 GURL url = extension->GetResourceURL("page.html"); | 714 GURL url = extension->GetResourceURL("page.html"); |
| 709 ui_test_utils::NavigateToURL(browser(), url); | 715 ui_test_utils::NavigateToURL(browser(), url); |
| 710 | 716 |
| (...skipping 17 matching lines...) Expand all Loading... |
| 728 push_message_listener.set_failure_message("FAIL"); | 734 push_message_listener.set_failure_message("FAIL"); |
| 729 gcm::IncomingMessage message; | 735 gcm::IncomingMessage message; |
| 730 message.sender_id = "1234567890"; | 736 message.sender_id = "1234567890"; |
| 731 message.raw_data = "testdata"; | 737 message.raw_data = "testdata"; |
| 732 message.decrypted = true; | 738 message.decrypted = true; |
| 733 push_service()->OnMessage(app_identifier.app_id(), message); | 739 push_service()->OnMessage(app_identifier.app_id(), message); |
| 734 EXPECT_TRUE(push_message_listener.WaitUntilSatisfied()); | 740 EXPECT_TRUE(push_message_listener.WaitUntilSatisfied()); |
| 735 } | 741 } |
| 736 | 742 |
| 737 } // namespace extensions | 743 } // namespace extensions |
| OLD | NEW |