| 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/bind.h" | 5 #include "base/bind.h" |
| 6 #include "base/callback.h" | 6 #include "base/callback.h" |
| 7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
| 8 #include "base/run_loop.h" | 8 #include "base/run_loop.h" |
| 9 #include "base/strings/utf_string_conversions.h" | 9 #include "base/strings/utf_string_conversions.h" |
| 10 #include "content/browser/fileapi/chrome_blob_storage_context.h" | 10 #include "content/browser/fileapi/chrome_blob_storage_context.h" |
| (...skipping 728 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 739 sync_run_loop.QuitClosure(), | 739 sync_run_loop.QuitClosure(), |
| 740 &status)); | 740 &status)); |
| 741 sync_run_loop.Run(); | 741 sync_run_loop.Run(); |
| 742 ASSERT_EQ(SERVICE_WORKER_OK, status); | 742 ASSERT_EQ(SERVICE_WORKER_OK, status); |
| 743 | 743 |
| 744 // Should 200 after sync event. | 744 // Should 200 after sync event. |
| 745 FetchOnRegisteredWorker(&result, &response, &blob_data_handle); | 745 FetchOnRegisteredWorker(&result, &response, &blob_data_handle); |
| 746 EXPECT_EQ(200, response.status_code); | 746 EXPECT_EQ(200, response.status_code); |
| 747 } | 747 } |
| 748 | 748 |
| 749 IN_PROC_BROWSER_TEST_F(ServiceWorkerBrowserTest, Reload) { | 749 // ServiceWorkerBrowserTest.Reload is flaky crbug.com/393486 |
| 750 IN_PROC_BROWSER_TEST_F(ServiceWorkerBrowserTest, DISABLED_Reload) { |
| 750 const std::string kPageUrl = "/service_worker/reload.html"; | 751 const std::string kPageUrl = "/service_worker/reload.html"; |
| 751 const std::string kWorkerUrl = "/service_worker/fetch_event_reload.js"; | 752 const std::string kWorkerUrl = "/service_worker/fetch_event_reload.js"; |
| 752 { | 753 { |
| 753 scoped_refptr<WorkerActivatedObserver> observer = | 754 scoped_refptr<WorkerActivatedObserver> observer = |
| 754 new WorkerActivatedObserver(wrapper()); | 755 new WorkerActivatedObserver(wrapper()); |
| 755 observer->Init(); | 756 observer->Init(); |
| 756 public_context()->RegisterServiceWorker( | 757 public_context()->RegisterServiceWorker( |
| 757 embedded_test_server()->GetURL(kPageUrl), | 758 embedded_test_server()->GetURL(kPageUrl), |
| 758 embedded_test_server()->GetURL(kWorkerUrl), | 759 embedded_test_server()->GetURL(kWorkerUrl), |
| 759 base::Bind(&ExpectResultAndRun, true, base::Bind(&base::DoNothing))); | 760 base::Bind(&ExpectResultAndRun, true, base::Bind(&base::DoNothing))); |
| (...skipping 173 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 933 base::Bind(&ServiceWorkerBlackBoxBrowserTest::FindRegistrationOnIO, | 934 base::Bind(&ServiceWorkerBlackBoxBrowserTest::FindRegistrationOnIO, |
| 934 this, | 935 this, |
| 935 embedded_test_server()->GetURL("/service_worker/empty.html"), | 936 embedded_test_server()->GetURL("/service_worker/empty.html"), |
| 936 &status, | 937 &status, |
| 937 &script_url)); | 938 &script_url)); |
| 938 EXPECT_EQ(SERVICE_WORKER_ERROR_NOT_FOUND, status); | 939 EXPECT_EQ(SERVICE_WORKER_ERROR_NOT_FOUND, status); |
| 939 } | 940 } |
| 940 } | 941 } |
| 941 | 942 |
| 942 } // namespace content | 943 } // namespace content |
| OLD | NEW |