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 582 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
593 ActivateTestHelper("/service_worker/worker_activate_rejected.js", | 593 ActivateTestHelper("/service_worker/worker_activate_rejected.js", |
594 SERVICE_WORKER_ERROR_ACTIVATE_WORKER_FAILED); | 594 SERVICE_WORKER_ERROR_ACTIVATE_WORKER_FAILED); |
595 } | 595 } |
596 | 596 |
597 IN_PROC_BROWSER_TEST_F(ServiceWorkerVersionBrowserTest, | 597 IN_PROC_BROWSER_TEST_F(ServiceWorkerVersionBrowserTest, |
598 InstallWithWaitUntil_Rejected) { | 598 InstallWithWaitUntil_Rejected) { |
599 InstallTestHelper("/service_worker/worker_install_rejected.js", | 599 InstallTestHelper("/service_worker/worker_install_rejected.js", |
600 SERVICE_WORKER_ERROR_INSTALL_WORKER_FAILED); | 600 SERVICE_WORKER_ERROR_INSTALL_WORKER_FAILED); |
601 } | 601 } |
602 | 602 |
603 IN_PROC_BROWSER_TEST_F(ServiceWorkerVersionBrowserTest, FetchEvent_Response) { | 603 IN_PROC_BROWSER_TEST_F(ServiceWorkerVersionBrowserTest, |
| 604 DISABLED_FetchEvent_Response) { |
604 ServiceWorkerFetchEventResult result; | 605 ServiceWorkerFetchEventResult result; |
605 ServiceWorkerResponse response; | 606 ServiceWorkerResponse response; |
606 scoped_ptr<webkit_blob::BlobDataHandle> blob_data_handle; | 607 scoped_ptr<webkit_blob::BlobDataHandle> blob_data_handle; |
607 FetchTestHelper("/service_worker/fetch_event.js", | 608 FetchTestHelper("/service_worker/fetch_event.js", |
608 &result, &response, &blob_data_handle); | 609 &result, &response, &blob_data_handle); |
609 ASSERT_EQ(SERVICE_WORKER_FETCH_EVENT_RESULT_RESPONSE, result); | 610 ASSERT_EQ(SERVICE_WORKER_FETCH_EVENT_RESULT_RESPONSE, result); |
610 EXPECT_EQ(301, response.status_code); | 611 EXPECT_EQ(301, response.status_code); |
611 EXPECT_EQ("Moved Permanently", response.status_text); | 612 EXPECT_EQ("Moved Permanently", response.status_text); |
612 std::map<std::string, std::string> expected_headers; | 613 std::map<std::string, std::string> expected_headers; |
613 expected_headers["Content-Language"] = "fi"; | 614 expected_headers["content-language"] = "fi"; |
614 expected_headers["Content-Type"] = "text/html; charset=UTF-8"; | 615 expected_headers["content-type"] = "text/html; charset=UTF-8"; |
615 EXPECT_EQ(expected_headers, response.headers); | 616 EXPECT_EQ(expected_headers, response.headers); |
616 | 617 |
617 std::string body; | 618 std::string body; |
618 RunOnIOThread( | 619 RunOnIOThread( |
619 base::Bind(&ReadResponseBody, | 620 base::Bind(&ReadResponseBody, |
620 &body, base::Owned(blob_data_handle.release()))); | 621 &body, base::Owned(blob_data_handle.release()))); |
621 EXPECT_EQ("This resource is gone. Gone, gone, gone.", body); | 622 EXPECT_EQ("This resource is gone. Gone, gone, gone.", body); |
622 } | 623 } |
623 | 624 |
624 IN_PROC_BROWSER_TEST_F(ServiceWorkerVersionBrowserTest, | 625 IN_PROC_BROWSER_TEST_F(ServiceWorkerVersionBrowserTest, |
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
662 sync_run_loop.QuitClosure(), | 663 sync_run_loop.QuitClosure(), |
663 &status)); | 664 &status)); |
664 sync_run_loop.Run(); | 665 sync_run_loop.Run(); |
665 ASSERT_EQ(SERVICE_WORKER_OK, status); | 666 ASSERT_EQ(SERVICE_WORKER_OK, status); |
666 | 667 |
667 // Should 200 after sync event. | 668 // Should 200 after sync event. |
668 FetchOnRegisteredWorker(&result, &response, &blob_data_handle); | 669 FetchOnRegisteredWorker(&result, &response, &blob_data_handle); |
669 EXPECT_EQ(200, response.status_code); | 670 EXPECT_EQ(200, response.status_code); |
670 } | 671 } |
671 | 672 |
672 IN_PROC_BROWSER_TEST_F(ServiceWorkerBrowserTest, Reload) { | 673 IN_PROC_BROWSER_TEST_F(ServiceWorkerBrowserTest, DISABLED_Reload) { |
673 const std::string kPageUrl = "/service_worker/reload.html"; | 674 const std::string kPageUrl = "/service_worker/reload.html"; |
674 const std::string kWorkerUrl = "/service_worker/fetch_event_reload.js"; | 675 const std::string kWorkerUrl = "/service_worker/fetch_event_reload.js"; |
675 { | 676 { |
676 scoped_refptr<WorkerActivatedObserver> observer = | 677 scoped_refptr<WorkerActivatedObserver> observer = |
677 new WorkerActivatedObserver(wrapper()); | 678 new WorkerActivatedObserver(wrapper()); |
678 observer->Init(); | 679 observer->Init(); |
679 public_context()->RegisterServiceWorker( | 680 public_context()->RegisterServiceWorker( |
680 embedded_test_server()->GetURL(kPageUrl), | 681 embedded_test_server()->GetURL(kPageUrl), |
681 embedded_test_server()->GetURL(kWorkerUrl), | 682 embedded_test_server()->GetURL(kWorkerUrl), |
682 base::Bind(&ExpectResultAndRun, true, base::Bind(&base::DoNothing))); | 683 base::Bind(&ExpectResultAndRun, true, base::Bind(&base::DoNothing))); |
(...skipping 137 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
820 base::Bind(&ServiceWorkerBlackBoxBrowserTest::FindRegistrationOnIO, | 821 base::Bind(&ServiceWorkerBlackBoxBrowserTest::FindRegistrationOnIO, |
821 this, | 822 this, |
822 embedded_test_server()->GetURL("/service_worker/empty.html"), | 823 embedded_test_server()->GetURL("/service_worker/empty.html"), |
823 &status, | 824 &status, |
824 &script_url)); | 825 &script_url)); |
825 EXPECT_EQ(SERVICE_WORKER_ERROR_NOT_FOUND, status); | 826 EXPECT_EQ(SERVICE_WORKER_ERROR_NOT_FOUND, status); |
826 } | 827 } |
827 } | 828 } |
828 | 829 |
829 } // namespace content | 830 } // namespace content |
OLD | NEW |