Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(566)

Side by Side Diff: content/browser/service_worker/service_worker_browsertest.cc

Issue 2910843002: [Cleanup] Move all browsertests to use ScopedFeatureList to modify features
Patch Set: Move SFL calls to constructor Created 3 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 1319 matching lines...) Expand 10 before | Expand all | Expand 10 after
1330 prefs->data_saver_enabled = data_saver_enabled_; 1330 prefs->data_saver_enabled = data_saver_enabled_;
1331 } 1331 }
1332 1332
1333 private: 1333 private:
1334 bool data_saver_enabled_; 1334 bool data_saver_enabled_;
1335 }; 1335 };
1336 1336
1337 class ServiceWorkerVersionOffMainThreadFetchTest 1337 class ServiceWorkerVersionOffMainThreadFetchTest
1338 : public ServiceWorkerVersionBrowserTest { 1338 : public ServiceWorkerVersionBrowserTest {
1339 public: 1339 public:
1340 ServiceWorkerVersionOffMainThreadFetchTest() {
1341 scoped_feature_list_.InitAndEnableFeature(features::kOffMainThreadFetch);
1342 }
1340 ~ServiceWorkerVersionOffMainThreadFetchTest() override {} 1343 ~ServiceWorkerVersionOffMainThreadFetchTest() override {}
1341 void SetUpCommandLine(base::CommandLine* command_line) override { 1344
1342 command_line->AppendSwitchASCII(switches::kEnableFeatures, 1345 private:
1343 features::kOffMainThreadFetch.name); 1346 base::test::ScopedFeatureList scoped_feature_list_;
1344 }
1345 }; 1347 };
1346 1348
1347 IN_PROC_BROWSER_TEST_F(ServiceWorkerVersionBrowserTest, FetchWithSaveData) { 1349 IN_PROC_BROWSER_TEST_F(ServiceWorkerVersionBrowserTest, FetchWithSaveData) {
1348 embedded_test_server()->RegisterRequestHandler( 1350 embedded_test_server()->RegisterRequestHandler(
1349 base::Bind(&VerifySaveDataHeaderInRequest)); 1351 base::Bind(&VerifySaveDataHeaderInRequest));
1350 StartServerAndNavigateToSetup(); 1352 StartServerAndNavigateToSetup();
1351 MockContentBrowserClient content_browser_client; 1353 MockContentBrowserClient content_browser_client;
1352 content_browser_client.set_data_saver_enabled(true); 1354 content_browser_client.set_data_saver_enabled(true);
1353 ContentBrowserClient* old_client = 1355 ContentBrowserClient* old_client =
1354 SetBrowserClientForTesting(&content_browser_client); 1356 SetBrowserClientForTesting(&content_browser_client);
(...skipping 183 matching lines...) Expand 10 before | Expand all | Expand 10 after
1538 public_context()->UnregisterServiceWorker( 1540 public_context()->UnregisterServiceWorker(
1539 embedded_test_server()->GetURL(kPageUrl), 1541 embedded_test_server()->GetURL(kPageUrl),
1540 base::Bind(&ExpectResultAndRun, true, run_loop.QuitClosure())); 1542 base::Bind(&ExpectResultAndRun, true, run_loop.QuitClosure()));
1541 run_loop.Run(); 1543 run_loop.Run();
1542 } 1544 }
1543 1545
1544 class ServiceWorkerNavigationPreloadTest : public ServiceWorkerBrowserTest { 1546 class ServiceWorkerNavigationPreloadTest : public ServiceWorkerBrowserTest {
1545 public: 1547 public:
1546 using self = ServiceWorkerNavigationPreloadTest; 1548 using self = ServiceWorkerNavigationPreloadTest;
1547 1549
1550 ServiceWorkerNavigationPreloadTest() {
1551 scoped_feature_list_.InitAndEnableFeature(
1552 features::kServiceWorkerNavigationPreload);
1553 }
1554
1548 ~ServiceWorkerNavigationPreloadTest() override {} 1555 ~ServiceWorkerNavigationPreloadTest() override {}
1549 1556
1550 void SetUpOnMainThread() override { 1557 void SetUpOnMainThread() override {
1551 host_resolver()->AddRule("*", "127.0.0.1"); 1558 host_resolver()->AddRule("*", "127.0.0.1");
1552 ServiceWorkerBrowserTest::SetUpOnMainThread(); 1559 ServiceWorkerBrowserTest::SetUpOnMainThread();
1553 } 1560 }
1554 1561
1555 void SetUpCommandLine(base::CommandLine* command_line) override {
1556 command_line->AppendSwitchASCII(
1557 switches::kEnableFeatures,
1558 features::kServiceWorkerNavigationPreload.name);
1559 }
1560
1561 protected: 1562 protected:
1562 static const std::string kNavigationPreloadHeaderName; 1563 static const std::string kNavigationPreloadHeaderName;
1563 static const std::string kEnableNavigationPreloadScript; 1564 static const std::string kEnableNavigationPreloadScript;
1564 static const std::string kPreloadResponseTestScript; 1565 static const std::string kPreloadResponseTestScript;
1565 1566
1566 static bool HasNavigationPreloadHeader( 1567 static bool HasNavigationPreloadHeader(
1567 const net::test_server::HttpRequest& request) { 1568 const net::test_server::HttpRequest& request) {
1568 return request.headers.find(kNavigationPreloadHeaderName) != 1569 return request.headers.find(kNavigationPreloadHeaderName) !=
1569 request.headers.end(); 1570 request.headers.end();
1570 } 1571 }
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
1656 base::ASCIIToUTF16("document.body.textContent;"), 1657 base::ASCIIToUTF16("document.body.textContent;"),
1657 base::Bind(&StoreString, &text_content, run_loop.QuitClosure())); 1658 base::Bind(&StoreString, &text_content, run_loop.QuitClosure()));
1658 run_loop.Run(); 1659 run_loop.Run();
1659 return text_content; 1660 return text_content;
1660 } 1661 }
1661 1662
1662 std::map<std::string, std::vector<net::test_server::HttpRequest>> 1663 std::map<std::string, std::vector<net::test_server::HttpRequest>>
1663 request_log_; 1664 request_log_;
1664 1665
1665 private: 1666 private:
1667 base::test::ScopedFeatureList scoped_feature_list_;
1666 class CustomResponse : public net::test_server::HttpResponse { 1668 class CustomResponse : public net::test_server::HttpResponse {
1667 public: 1669 public:
1668 CustomResponse(const std::string& response) : response_(response) {} 1670 CustomResponse(const std::string& response) : response_(response) {}
1669 ~CustomResponse() override {} 1671 ~CustomResponse() override {}
1670 1672
1671 void SendResponse( 1673 void SendResponse(
1672 const net::test_server::SendBytesCallback& send, 1674 const net::test_server::SendBytesCallback& send,
1673 const net::test_server::SendCompleteCallback& done) override { 1675 const net::test_server::SendCompleteCallback& done) override {
1674 send.Run(response_, done); 1676 send.Run(response_, done);
1675 } 1677 }
(...skipping 1291 matching lines...) Expand 10 before | Expand all | Expand 10 after
2967 IN_PROC_BROWSER_TEST_F(ServiceWorkerDisableWebSecurityTest, UpdateNoCrash) { 2969 IN_PROC_BROWSER_TEST_F(ServiceWorkerDisableWebSecurityTest, UpdateNoCrash) {
2968 StartServerAndNavigateToSetup(); 2970 StartServerAndNavigateToSetup();
2969 const char kPageUrl[] = "/service_worker/disable_web_security_update.html"; 2971 const char kPageUrl[] = "/service_worker/disable_web_security_update.html";
2970 const char kScopeUrl[] = "/service_worker/scope/"; 2972 const char kScopeUrl[] = "/service_worker/scope/";
2971 const char kWorkerUrl[] = "/service_worker/fetch_event_blob.js"; 2973 const char kWorkerUrl[] = "/service_worker/fetch_event_blob.js";
2972 RegisterServiceWorkerOnCrossOriginServer(kScopeUrl, kWorkerUrl); 2974 RegisterServiceWorkerOnCrossOriginServer(kScopeUrl, kWorkerUrl);
2973 RunTestWithCrossOriginURL(kPageUrl, kScopeUrl); 2975 RunTestWithCrossOriginURL(kPageUrl, kScopeUrl);
2974 } 2976 }
2975 2977
2976 } // namespace content 2978 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/renderer_host/media/video_capture_browsertest.cc ('k') | content/browser/shared_worker/worker_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698