| 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 <memory> | 9 #include <memory> |
| 10 #include <utility> | 10 #include <utility> |
| (...skipping 912 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 923 ActivateTestHelper("/service_worker/worker_activate_rejected.js", | 923 ActivateTestHelper("/service_worker/worker_activate_rejected.js", |
| 924 SERVICE_WORKER_ERROR_EVENT_WAITUNTIL_REJECTED); | 924 SERVICE_WORKER_ERROR_EVENT_WAITUNTIL_REJECTED); |
| 925 } | 925 } |
| 926 | 926 |
| 927 IN_PROC_BROWSER_TEST_F(ServiceWorkerVersionBrowserTest, | 927 IN_PROC_BROWSER_TEST_F(ServiceWorkerVersionBrowserTest, |
| 928 InstallWithWaitUntil_Rejected) { | 928 InstallWithWaitUntil_Rejected) { |
| 929 InstallTestHelper("/service_worker/worker_install_rejected.js", | 929 InstallTestHelper("/service_worker/worker_install_rejected.js", |
| 930 SERVICE_WORKER_ERROR_EVENT_WAITUNTIL_REJECTED); | 930 SERVICE_WORKER_ERROR_EVENT_WAITUNTIL_REJECTED); |
| 931 } | 931 } |
| 932 | 932 |
| 933 // Has errors under TSan. See https://crbug.com/631323. |
| 934 #if defined(THREAD_SANITIZER) |
| 935 #define MAYBE_InstallWithWaitUntil_RejectConsoleMessage \ |
| 936 DISABLED_InstallWithWaitUntil_RejectConsoleMessage |
| 937 #else |
| 938 #define MAYBE_InstallWithWaitUntil_RejectConsoleMessage \ |
| 939 InstallWithWaitUntil_RejectConsoleMessage |
| 940 #endif |
| 933 IN_PROC_BROWSER_TEST_F(ServiceWorkerVersionBrowserTest, | 941 IN_PROC_BROWSER_TEST_F(ServiceWorkerVersionBrowserTest, |
| 934 InstallWithWaitUntil_RejectConsoleMessage) { | 942 MAYBE_InstallWithWaitUntil_RejectConsoleMessage) { |
| 935 RunOnIOThread(base::Bind(&self::SetUpRegistrationOnIOThread, this, | 943 RunOnIOThread(base::Bind(&self::SetUpRegistrationOnIOThread, this, |
| 936 "/service_worker/worker_install_rejected.js")); | 944 "/service_worker/worker_install_rejected.js")); |
| 937 | 945 |
| 938 ConsoleListener console_listener; | 946 ConsoleListener console_listener; |
| 939 version_->embedded_worker()->AddListener(&console_listener); | 947 version_->embedded_worker()->AddListener(&console_listener); |
| 940 | 948 |
| 941 // Dispatch install on a worker. | 949 // Dispatch install on a worker. |
| 942 ServiceWorkerStatusCode status = SERVICE_WORKER_ERROR_FAILED; | 950 ServiceWorkerStatusCode status = SERVICE_WORKER_ERROR_FAILED; |
| 943 base::RunLoop install_run_loop; | 951 base::RunLoop install_run_loop; |
| 944 BrowserThread::PostTask(BrowserThread::IO, FROM_HERE, | 952 BrowserThread::PostTask(BrowserThread::IO, FROM_HERE, |
| (...skipping 16 matching lines...) Expand all Loading... |
| 961 | 969 |
| 962 void OnThreadStarted() override { | 970 void OnThreadStarted() override { |
| 963 BrowserThread::PostTask(BrowserThread::UI, FROM_HERE, quit_); | 971 BrowserThread::PostTask(BrowserThread::UI, FROM_HERE, quit_); |
| 964 } | 972 } |
| 965 bool OnMessageReceived(const IPC::Message& message) override { return false; } | 973 bool OnMessageReceived(const IPC::Message& message) override { return false; } |
| 966 | 974 |
| 967 private: | 975 private: |
| 968 base::Closure quit_; | 976 base::Closure quit_; |
| 969 }; | 977 }; |
| 970 | 978 |
| 971 IN_PROC_BROWSER_TEST_F(ServiceWorkerVersionBrowserTest, TimeoutStartingWorker) { | 979 // Has errors under TSan. See https://crbug.com/631323. |
| 980 #if defined(THREAD_SANITIZER) |
| 981 #define MAYBE_TimeoutStartingWorker DISABLED_TimeoutStartingWorker |
| 982 #else |
| 983 #define MAYBE_TimeoutStartingWorker TimeoutStartingWorker |
| 984 #endif |
| 985 IN_PROC_BROWSER_TEST_F(ServiceWorkerVersionBrowserTest, |
| 986 MAYBE_TimeoutStartingWorker) { |
| 972 RunOnIOThread(base::Bind(&self::SetUpRegistrationOnIOThread, this, | 987 RunOnIOThread(base::Bind(&self::SetUpRegistrationOnIOThread, this, |
| 973 "/service_worker/while_true_worker.js")); | 988 "/service_worker/while_true_worker.js")); |
| 974 | 989 |
| 975 // Start a worker, waiting until the script is loaded. | 990 // Start a worker, waiting until the script is loaded. |
| 976 ServiceWorkerStatusCode status = SERVICE_WORKER_ERROR_FAILED; | 991 ServiceWorkerStatusCode status = SERVICE_WORKER_ERROR_FAILED; |
| 977 base::RunLoop start_run_loop; | 992 base::RunLoop start_run_loop; |
| 978 base::RunLoop load_run_loop; | 993 base::RunLoop load_run_loop; |
| 979 WaitForLoaded wait_for_load(load_run_loop.QuitClosure()); | 994 WaitForLoaded wait_for_load(load_run_loop.QuitClosure()); |
| 980 version_->embedded_worker()->AddListener(&wait_for_load); | 995 version_->embedded_worker()->AddListener(&wait_for_load); |
| 981 BrowserThread::PostTask(BrowserThread::IO, FROM_HERE, | 996 BrowserThread::PostTask(BrowserThread::IO, FROM_HERE, |
| (...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1072 | 1087 |
| 1073 FetchOnRegisteredWorker(&result, &response2, &blob_data_handle); | 1088 FetchOnRegisteredWorker(&result, &response2, &blob_data_handle); |
| 1074 ASSERT_EQ(SERVICE_WORKER_FETCH_EVENT_RESULT_RESPONSE, result); | 1089 ASSERT_EQ(SERVICE_WORKER_FETCH_EVENT_RESULT_RESPONSE, result); |
| 1075 EXPECT_EQ(200, response2.status_code); | 1090 EXPECT_EQ(200, response2.status_code); |
| 1076 EXPECT_EQ("OK", response2.status_text); | 1091 EXPECT_EQ("OK", response2.status_text); |
| 1077 EXPECT_EQ(response1.response_time, response2.response_time); | 1092 EXPECT_EQ(response1.response_time, response2.response_time); |
| 1078 EXPECT_TRUE(response2.is_in_cache_storage); | 1093 EXPECT_TRUE(response2.is_in_cache_storage); |
| 1079 EXPECT_EQ("cache_name", response2.cache_storage_cache_name); | 1094 EXPECT_EQ("cache_name", response2.cache_storage_cache_name); |
| 1080 } | 1095 } |
| 1081 | 1096 |
| 1097 // Has errors under TSan. See https://crbug.com/631323. |
| 1098 #if defined(THREAD_SANITIZER) |
| 1099 #define MAYBE_FetchEvent_respondWithRejection \ |
| 1100 DISABLED_FetchEvent_respondWithRejection |
| 1101 #else |
| 1102 #define MAYBE_FetchEvent_respondWithRejection FetchEvent_respondWithRejection |
| 1103 #endif |
| 1082 IN_PROC_BROWSER_TEST_F(ServiceWorkerVersionBrowserTest, | 1104 IN_PROC_BROWSER_TEST_F(ServiceWorkerVersionBrowserTest, |
| 1083 FetchEvent_respondWithRejection) { | 1105 MAYBE_FetchEvent_respondWithRejection) { |
| 1084 ServiceWorkerFetchEventResult result; | 1106 ServiceWorkerFetchEventResult result; |
| 1085 ServiceWorkerResponse response; | 1107 ServiceWorkerResponse response; |
| 1086 std::unique_ptr<storage::BlobDataHandle> blob_data_handle; | 1108 std::unique_ptr<storage::BlobDataHandle> blob_data_handle; |
| 1087 | 1109 |
| 1088 RunOnIOThread(base::Bind(&self::SetUpRegistrationOnIOThread, this, | 1110 RunOnIOThread(base::Bind(&self::SetUpRegistrationOnIOThread, this, |
| 1089 "/service_worker/fetch_event_rejected.js")); | 1111 "/service_worker/fetch_event_rejected.js")); |
| 1090 | 1112 |
| 1091 ConsoleListener console_listener; | 1113 ConsoleListener console_listener; |
| 1092 version_->embedded_worker()->AddListener(&console_listener); | 1114 version_->embedded_worker()->AddListener(&console_listener); |
| 1093 | 1115 |
| (...skipping 795 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1889 private: | 1911 private: |
| 1890 DISALLOW_COPY_AND_ASSIGN(ServiceWorkerV8CacheStrategiesAggressiveTest); | 1912 DISALLOW_COPY_AND_ASSIGN(ServiceWorkerV8CacheStrategiesAggressiveTest); |
| 1891 }; | 1913 }; |
| 1892 | 1914 |
| 1893 IN_PROC_BROWSER_TEST_F(ServiceWorkerV8CacheStrategiesAggressiveTest, | 1915 IN_PROC_BROWSER_TEST_F(ServiceWorkerV8CacheStrategiesAggressiveTest, |
| 1894 V8CacheOnCacheStorage) { | 1916 V8CacheOnCacheStorage) { |
| 1895 CheckStrategyIsAggressive(); | 1917 CheckStrategyIsAggressive(); |
| 1896 } | 1918 } |
| 1897 | 1919 |
| 1898 } // namespace content | 1920 } // namespace content |
| OLD | NEW |