Commit ef124da3 authored by Kenichi Ishibashi's avatar Kenichi Ishibashi Committed by Commit Bot

Disable S13nServiceWorker in ServiceWorkerURLRequestJobTest

ServiceWorkerURLRequestJob is non-S13nServiceWorker specific
class and we don't use it when S13nServiceWorker is enabled.

This CL explicitly disable S13nServiceWorker in
ServiceWorkerURLRequestJobTest.

Bug: 860361
Change-Id: I9432b773b02cdee13ab877395f3d3ed3d5839c87
Reviewed-on: https://chromium-review.googlesource.com/1147897
Commit-Queue: Kenichi Ishibashi <bashi@chromium.org>
Reviewed-by: default avatarMakoto Shimazu <shimazu@chromium.org>
Reviewed-by: default avatarMatt Falkenhagen <falken@chromium.org>
Cr-Commit-Position: refs/heads/master@{#577458}
parent 4bd63c29
...@@ -15,6 +15,7 @@ ...@@ -15,6 +15,7 @@
#include "base/run_loop.h" #include "base/run_loop.h"
#include "base/single_thread_task_runner.h" #include "base/single_thread_task_runner.h"
#include "base/test/metrics/histogram_tester.h" #include "base/test/metrics/histogram_tester.h"
#include "base/test/scoped_feature_list.h"
#include "base/test/simple_test_tick_clock.h" #include "base/test/simple_test_tick_clock.h"
#include "base/threading/thread_task_runner_handle.h" #include "base/threading/thread_task_runner_handle.h"
#include "base/time/time.h" #include "base/time/time.h"
...@@ -60,6 +61,7 @@ ...@@ -60,6 +61,7 @@
#include "storage/browser/blob/blob_url_request_job_factory.h" #include "storage/browser/blob/blob_url_request_job_factory.h"
#include "storage/common/blob_storage/blob_handle.h" #include "storage/common/blob_storage/blob_handle.h"
#include "testing/gtest/include/gtest/gtest.h" #include "testing/gtest/include/gtest/gtest.h"
#include "third_party/blink/public/common/features.h"
#include "third_party/blink/public/common/service_worker/service_worker_status_code.h" #include "third_party/blink/public/common/service_worker/service_worker_status_code.h"
#include "third_party/blink/public/mojom/service_worker/service_worker.mojom.h" #include "third_party/blink/public/mojom/service_worker/service_worker.mojom.h"
#include "third_party/blink/public/mojom/service_worker/service_worker_event_status.mojom.h" #include "third_party/blink/public/mojom/service_worker/service_worker_event_status.mojom.h"
...@@ -195,6 +197,10 @@ class ServiceWorkerURLRequestJobTest ...@@ -195,6 +197,10 @@ class ServiceWorkerURLRequestJobTest
~ServiceWorkerURLRequestJobTest() override {} ~ServiceWorkerURLRequestJobTest() override {}
void SetUp() override { void SetUp() override {
// ServiceWorkerURLRequestJob is a non-S13nServiceWorker specific class
// and we don't use it when S13nServiceWorker is enabled.
scoped_feature_list_.InitAndDisableFeature(
blink::features::kServiceWorkerServicification);
browser_context_.reset(new TestBrowserContext); browser_context_.reset(new TestBrowserContext);
InitializeResourceContext(browser_context_.get()); InitializeResourceContext(browser_context_.get());
} }
...@@ -406,6 +412,10 @@ class ServiceWorkerURLRequestJobTest ...@@ -406,6 +412,10 @@ class ServiceWorkerURLRequestJobTest
} }
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
// |scoped_feature_list_| must be before |thread_bundle_|.
// See comments in ServiceWorkerProviderHostTest.
base::test::ScopedFeatureList scoped_feature_list_;
TestBrowserThreadBundle thread_bundle_; TestBrowserThreadBundle thread_bundle_;
base::SimpleTestTickClock tick_clock_; base::SimpleTestTickClock tick_clock_;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment