| 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 "base/files/scoped_temp_dir.h" | 5 #include "base/files/scoped_temp_dir.h" |
| 6 #include "base/logging.h" | 6 #include "base/logging.h" |
| 7 #include "base/run_loop.h" | 7 #include "base/run_loop.h" |
| 8 #include "content/browser/browser_thread_impl.h" | 8 #include "content/browser/browser_thread_impl.h" |
| 9 #include "content/browser/service_worker/embedded_worker_registry.h" | 9 #include "content/browser/service_worker/embedded_worker_registry.h" |
| 10 #include "content/browser/service_worker/embedded_worker_test_helper.h" | 10 #include "content/browser/service_worker/embedded_worker_test_helper.h" |
| (...skipping 1244 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1255 } | 1255 } |
| 1256 | 1256 |
| 1257 class EventCallbackHelper : public EmbeddedWorkerTestHelper { | 1257 class EventCallbackHelper : public EmbeddedWorkerTestHelper { |
| 1258 public: | 1258 public: |
| 1259 explicit EventCallbackHelper(int mock_render_process_id) | 1259 explicit EventCallbackHelper(int mock_render_process_id) |
| 1260 : EmbeddedWorkerTestHelper(mock_render_process_id), | 1260 : EmbeddedWorkerTestHelper(mock_render_process_id), |
| 1261 install_event_result_(blink::WebServiceWorkerEventResultCompleted), | 1261 install_event_result_(blink::WebServiceWorkerEventResultCompleted), |
| 1262 activate_event_result_(blink::WebServiceWorkerEventResultCompleted) {} | 1262 activate_event_result_(blink::WebServiceWorkerEventResultCompleted) {} |
| 1263 | 1263 |
| 1264 void OnInstallEvent(int embedded_worker_id, | 1264 void OnInstallEvent(int embedded_worker_id, |
| 1265 int request_id, | 1265 int request_id) override { |
| 1266 int active_version_id) override { | |
| 1267 if (!install_callback_.is_null()) | 1266 if (!install_callback_.is_null()) |
| 1268 install_callback_.Run(); | 1267 install_callback_.Run(); |
| 1269 SimulateSend( | 1268 SimulateSend( |
| 1270 new ServiceWorkerHostMsg_InstallEventFinished( | 1269 new ServiceWorkerHostMsg_InstallEventFinished( |
| 1271 embedded_worker_id, request_id, install_event_result_)); | 1270 embedded_worker_id, request_id, install_event_result_)); |
| 1272 } | 1271 } |
| 1273 void OnActivateEvent(int embedded_worker_id, int request_id) override { | 1272 void OnActivateEvent(int embedded_worker_id, int request_id) override { |
| 1274 SimulateSend( | 1273 SimulateSend( |
| 1275 new ServiceWorkerHostMsg_ActivateEventFinished( | 1274 new ServiceWorkerHostMsg_ActivateEventFinished( |
| 1276 embedded_worker_id, request_id, activate_event_result_)); | 1275 embedded_worker_id, request_id, activate_event_result_)); |
| (...skipping 120 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1397 EXPECT_FALSE(registration->is_uninstalling()); | 1396 EXPECT_FALSE(registration->is_uninstalling()); |
| 1398 EXPECT_TRUE(registration->is_uninstalled()); | 1397 EXPECT_TRUE(registration->is_uninstalled()); |
| 1399 | 1398 |
| 1400 EXPECT_EQ(ServiceWorkerVersion::STOPPED, old_version->running_status()); | 1399 EXPECT_EQ(ServiceWorkerVersion::STOPPED, old_version->running_status()); |
| 1401 EXPECT_EQ(ServiceWorkerVersion::REDUNDANT, old_version->status()); | 1400 EXPECT_EQ(ServiceWorkerVersion::REDUNDANT, old_version->status()); |
| 1402 | 1401 |
| 1403 FindRegistrationForPattern(pattern, SERVICE_WORKER_ERROR_NOT_FOUND); | 1402 FindRegistrationForPattern(pattern, SERVICE_WORKER_ERROR_NOT_FOUND); |
| 1404 } | 1403 } |
| 1405 | 1404 |
| 1406 } // namespace content | 1405 } // namespace content |
| OLD | NEW |