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 1318 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1329 } | 1329 } |
1330 | 1330 |
1331 private: | 1331 private: |
1332 bool data_saver_enabled_; | 1332 bool data_saver_enabled_; |
1333 }; | 1333 }; |
1334 | 1334 |
1335 class ServiceWorkerVersionOffMainThreadFetchTest | 1335 class ServiceWorkerVersionOffMainThreadFetchTest |
1336 : public ServiceWorkerVersionBrowserTest { | 1336 : public ServiceWorkerVersionBrowserTest { |
1337 public: | 1337 public: |
1338 ~ServiceWorkerVersionOffMainThreadFetchTest() override {} | 1338 ~ServiceWorkerVersionOffMainThreadFetchTest() override {} |
1339 void SetUpCommandLine(base::CommandLine* command_line) override { | 1339 void SetUp() override { |
1340 command_line->AppendSwitchASCII(switches::kEnableFeatures, | 1340 scoped_feature_list_.InitAndEnableFeature(features::kOffMainThreadFetch); |
1341 features::kOffMainThreadFetch.name); | 1341 ServiceWorkerVersionBrowserTest::SetUp(); |
1342 } | 1342 } |
| 1343 |
| 1344 private: |
| 1345 base::test::ScopedFeatureList scoped_feature_list_; |
1343 }; | 1346 }; |
1344 | 1347 |
1345 IN_PROC_BROWSER_TEST_F(ServiceWorkerVersionBrowserTest, FetchWithSaveData) { | 1348 IN_PROC_BROWSER_TEST_F(ServiceWorkerVersionBrowserTest, FetchWithSaveData) { |
1346 embedded_test_server()->RegisterRequestHandler( | 1349 embedded_test_server()->RegisterRequestHandler( |
1347 base::Bind(&VerifySaveDataHeaderInRequest)); | 1350 base::Bind(&VerifySaveDataHeaderInRequest)); |
1348 StartServerAndNavigateToSetup(); | 1351 StartServerAndNavigateToSetup(); |
1349 MockContentBrowserClient content_browser_client; | 1352 MockContentBrowserClient content_browser_client; |
1350 content_browser_client.set_data_saver_enabled(true); | 1353 content_browser_client.set_data_saver_enabled(true); |
1351 ContentBrowserClient* old_client = | 1354 ContentBrowserClient* old_client = |
1352 SetBrowserClientForTesting(&content_browser_client); | 1355 SetBrowserClientForTesting(&content_browser_client); |
(...skipping 190 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1543 public: | 1546 public: |
1544 using self = ServiceWorkerNavigationPreloadTest; | 1547 using self = ServiceWorkerNavigationPreloadTest; |
1545 | 1548 |
1546 ~ServiceWorkerNavigationPreloadTest() override {} | 1549 ~ServiceWorkerNavigationPreloadTest() override {} |
1547 | 1550 |
1548 void SetUpOnMainThread() override { | 1551 void SetUpOnMainThread() override { |
1549 host_resolver()->AddRule("*", "127.0.0.1"); | 1552 host_resolver()->AddRule("*", "127.0.0.1"); |
1550 ServiceWorkerBrowserTest::SetUpOnMainThread(); | 1553 ServiceWorkerBrowserTest::SetUpOnMainThread(); |
1551 } | 1554 } |
1552 | 1555 |
1553 void SetUpCommandLine(base::CommandLine* command_line) override { | 1556 void SetUp() override { |
1554 command_line->AppendSwitchASCII( | 1557 scoped_feature_list_.InitAndEnableFeature( |
1555 switches::kEnableFeatures, | 1558 features::kServiceWorkerNavigationPreload); |
1556 features::kServiceWorkerNavigationPreload.name); | 1559 ServiceWorkerBrowserTest::SetUp(); |
1557 } | 1560 } |
1558 | 1561 |
1559 protected: | 1562 protected: |
1560 static const std::string kNavigationPreloadHeaderName; | 1563 static const std::string kNavigationPreloadHeaderName; |
1561 static const std::string kEnableNavigationPreloadScript; | 1564 static const std::string kEnableNavigationPreloadScript; |
1562 static const std::string kPreloadResponseTestScript; | 1565 static const std::string kPreloadResponseTestScript; |
1563 | 1566 |
1564 static bool HasNavigationPreloadHeader( | 1567 static bool HasNavigationPreloadHeader( |
1565 const net::test_server::HttpRequest& request) { | 1568 const net::test_server::HttpRequest& request) { |
1566 return request.headers.find(kNavigationPreloadHeaderName) != | 1569 return request.headers.find(kNavigationPreloadHeaderName) != |
(...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1654 base::ASCIIToUTF16("document.body.textContent;"), | 1657 base::ASCIIToUTF16("document.body.textContent;"), |
1655 base::Bind(&StoreString, &text_content, run_loop.QuitClosure())); | 1658 base::Bind(&StoreString, &text_content, run_loop.QuitClosure())); |
1656 run_loop.Run(); | 1659 run_loop.Run(); |
1657 return text_content; | 1660 return text_content; |
1658 } | 1661 } |
1659 | 1662 |
1660 std::map<std::string, std::vector<net::test_server::HttpRequest>> | 1663 std::map<std::string, std::vector<net::test_server::HttpRequest>> |
1661 request_log_; | 1664 request_log_; |
1662 | 1665 |
1663 private: | 1666 private: |
| 1667 base::test::ScopedFeatureList scoped_feature_list_; |
1664 class CustomResponse : public net::test_server::HttpResponse { | 1668 class CustomResponse : public net::test_server::HttpResponse { |
1665 public: | 1669 public: |
1666 CustomResponse(const std::string& response) : response_(response) {} | 1670 CustomResponse(const std::string& response) : response_(response) {} |
1667 ~CustomResponse() override {} | 1671 ~CustomResponse() override {} |
1668 | 1672 |
1669 void SendResponse( | 1673 void SendResponse( |
1670 const net::test_server::SendBytesCallback& send, | 1674 const net::test_server::SendBytesCallback& send, |
1671 const net::test_server::SendCompleteCallback& done) override { | 1675 const net::test_server::SendCompleteCallback& done) override { |
1672 send.Run(response_, done); | 1676 send.Run(response_, done); |
1673 } | 1677 } |
(...skipping 1291 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2965 IN_PROC_BROWSER_TEST_F(ServiceWorkerDisableWebSecurityTest, UpdateNoCrash) { | 2969 IN_PROC_BROWSER_TEST_F(ServiceWorkerDisableWebSecurityTest, UpdateNoCrash) { |
2966 StartServerAndNavigateToSetup(); | 2970 StartServerAndNavigateToSetup(); |
2967 const char kPageUrl[] = "/service_worker/disable_web_security_update.html"; | 2971 const char kPageUrl[] = "/service_worker/disable_web_security_update.html"; |
2968 const char kScopeUrl[] = "/service_worker/scope/"; | 2972 const char kScopeUrl[] = "/service_worker/scope/"; |
2969 const char kWorkerUrl[] = "/service_worker/fetch_event_blob.js"; | 2973 const char kWorkerUrl[] = "/service_worker/fetch_event_blob.js"; |
2970 RegisterServiceWorkerOnCrossOriginServer(kScopeUrl, kWorkerUrl); | 2974 RegisterServiceWorkerOnCrossOriginServer(kScopeUrl, kWorkerUrl); |
2971 RunTestWithCrossOriginURL(kPageUrl, kScopeUrl); | 2975 RunTestWithCrossOriginURL(kPageUrl, kScopeUrl); |
2972 } | 2976 } |
2973 | 2977 |
2974 } // namespace content | 2978 } // namespace content |
OLD | NEW |