| Index: content/browser/service_worker/service_worker_version.h
|
| diff --git a/content/browser/service_worker/service_worker_version.h b/content/browser/service_worker/service_worker_version.h
|
| index b05b99383d8721fe7bce553d7208abd16e0428ae..36a88fdd272ae79e6701b12ecf086fa3551e99c8 100644
|
| --- a/content/browser/service_worker/service_worker_version.h
|
| +++ b/content/browser/service_worker/service_worker_version.h
|
| @@ -413,22 +413,23 @@ class CONTENT_EXPORT ServiceWorkerVersion
|
| friend class ServiceWorkerStallInStoppingTest;
|
| friend class ServiceWorkerURLRequestJobTest;
|
| friend class ServiceWorkerVersionBrowserTest;
|
| - friend class ServiceWorkerVersionTest;
|
| + friend class ServiceWorkerVersionTestP;
|
|
|
| FRIEND_TEST_ALL_PREFIXES(ServiceWorkerControlleeRequestHandlerTest,
|
| ActivateWaitingVersion);
|
| FRIEND_TEST_ALL_PREFIXES(ServiceWorkerControlleeRequestHandlerTest,
|
| FallbackWithNoFetchHandler);
|
| - FRIEND_TEST_ALL_PREFIXES(ServiceWorkerVersionTest, IdleTimeout);
|
| - FRIEND_TEST_ALL_PREFIXES(ServiceWorkerVersionTest, SetDevToolsAttached);
|
| - FRIEND_TEST_ALL_PREFIXES(ServiceWorkerVersionTest, StaleUpdate_FreshWorker);
|
| - FRIEND_TEST_ALL_PREFIXES(ServiceWorkerVersionTest,
|
| + FRIEND_TEST_ALL_PREFIXES(ServiceWorkerVersionTestP, IdleTimeout);
|
| + FRIEND_TEST_ALL_PREFIXES(ServiceWorkerVersionTestP, SetDevToolsAttached);
|
| + FRIEND_TEST_ALL_PREFIXES(ServiceWorkerVersionTestP, StaleUpdate_FreshWorker);
|
| + FRIEND_TEST_ALL_PREFIXES(ServiceWorkerVersionTestP,
|
| StaleUpdate_NonActiveWorker);
|
| - FRIEND_TEST_ALL_PREFIXES(ServiceWorkerVersionTest, StaleUpdate_StartWorker);
|
| - FRIEND_TEST_ALL_PREFIXES(ServiceWorkerVersionTest, StaleUpdate_RunningWorker);
|
| - FRIEND_TEST_ALL_PREFIXES(ServiceWorkerVersionTest,
|
| + FRIEND_TEST_ALL_PREFIXES(ServiceWorkerVersionTestP, StaleUpdate_StartWorker);
|
| + FRIEND_TEST_ALL_PREFIXES(ServiceWorkerVersionTestP,
|
| + StaleUpdate_RunningWorker);
|
| + FRIEND_TEST_ALL_PREFIXES(ServiceWorkerVersionTestP,
|
| StaleUpdate_DoNotDeferTimer);
|
| - FRIEND_TEST_ALL_PREFIXES(ServiceWorkerVersionTest, RequestTimeout);
|
| + FRIEND_TEST_ALL_PREFIXES(ServiceWorkerVersionTestP, RequestTimeout);
|
| FRIEND_TEST_ALL_PREFIXES(ServiceWorkerFailToStartTest, Timeout);
|
| FRIEND_TEST_ALL_PREFIXES(ServiceWorkerVersionBrowserTest,
|
| TimeoutStartingWorker);
|
| @@ -436,12 +437,12 @@ class CONTENT_EXPORT ServiceWorkerVersion
|
| TimeoutWorkerInEvent);
|
| FRIEND_TEST_ALL_PREFIXES(ServiceWorkerStallInStoppingTest, DetachThenStart);
|
| FRIEND_TEST_ALL_PREFIXES(ServiceWorkerStallInStoppingTest, DetachThenRestart);
|
| - FRIEND_TEST_ALL_PREFIXES(ServiceWorkerVersionTest,
|
| + FRIEND_TEST_ALL_PREFIXES(ServiceWorkerVersionTestP,
|
| RegisterForeignFetchScopes);
|
| - FRIEND_TEST_ALL_PREFIXES(ServiceWorkerVersionTest, RequestCustomizedTimeout);
|
| - FRIEND_TEST_ALL_PREFIXES(ServiceWorkerVersionTest,
|
| + FRIEND_TEST_ALL_PREFIXES(ServiceWorkerVersionTestP, RequestCustomizedTimeout);
|
| + FRIEND_TEST_ALL_PREFIXES(ServiceWorkerVersionTestP,
|
| RequestCustomizedTimeoutKill);
|
| - FRIEND_TEST_ALL_PREFIXES(ServiceWorkerVersionTest, MixedRequestTimeouts);
|
| + FRIEND_TEST_ALL_PREFIXES(ServiceWorkerVersionTestP, MixedRequestTimeouts);
|
| FRIEND_TEST_ALL_PREFIXES(ServiceWorkerURLRequestJobTest, EarlyResponse);
|
| FRIEND_TEST_ALL_PREFIXES(ServiceWorkerURLRequestJobTest, CancelRequest);
|
| FRIEND_TEST_ALL_PREFIXES(ServiceWorkerActivationTest, SkipWaiting);
|
|
|