diff options
Diffstat (limited to 'chromium/content/browser/service_worker/embedded_worker_test_helper.h')
| -rw-r--r-- | chromium/content/browser/service_worker/embedded_worker_test_helper.h | 57 |
1 files changed, 42 insertions, 15 deletions
diff --git a/chromium/content/browser/service_worker/embedded_worker_test_helper.h b/chromium/content/browser/service_worker/embedded_worker_test_helper.h index c0cd7275d30..609a99102b0 100644 --- a/chromium/content/browser/service_worker/embedded_worker_test_helper.h +++ b/chromium/content/browser/service_worker/embedded_worker_test_helper.h @@ -24,8 +24,10 @@ #include "content/common/service_worker/service_worker_status_code.h" #include "ipc/ipc_listener.h" #include "ipc/ipc_test_sink.h" -#include "mojo/public/cpp/bindings/associated_binding.h" +#include "mojo/public/cpp/bindings/binding.h" +#include "net/cookies/cookie_change_dispatcher.h" #include "net/http/http_response_info.h" +#include "services/network/public/mojom/cookie_manager.mojom.h" #include "third_party/blink/public/mojom/service_worker/service_worker.mojom.h" #include "third_party/blink/public/mojom/service_worker/service_worker_installed_scripts_manager.mojom.h" #include "url/gurl.h" @@ -71,9 +73,8 @@ class EmbeddedWorkerTestHelper : public IPC::Sender, base::WeakPtr<EmbeddedWorkerTestHelper> helper); ~MockEmbeddedWorkerInstanceClient() override; - static void Bind( - const base::WeakPtr<EmbeddedWorkerTestHelper>& helper, - mojom::EmbeddedWorkerInstanceClientAssociatedRequest request); + static void Bind(const base::WeakPtr<EmbeddedWorkerTestHelper>& helper, + mojom::EmbeddedWorkerInstanceClientRequest request); protected: // mojom::EmbeddedWorkerInstanceClient implementation. @@ -86,7 +87,7 @@ class EmbeddedWorkerTestHelper : public IPC::Sender, blink::mojom::DevToolsAgentAssociatedRequest request) override {} base::WeakPtr<EmbeddedWorkerTestHelper> helper_; - mojo::AssociatedBinding<mojom::EmbeddedWorkerInstanceClient> binding_; + mojo::Binding<mojom::EmbeddedWorkerInstanceClient> binding_; base::Optional<int> embedded_worker_id_; @@ -153,10 +154,6 @@ class EmbeddedWorkerTestHelper : public IPC::Sender, return render_process_host_.get(); } - std::map<int, int64_t> embedded_worker_id_service_worker_version_id_map() { - return embedded_worker_id_service_worker_version_id_map_; - } - // Only used for tests that force creating a new render process. int new_render_process_id() const { return new_mock_render_process_id_; } @@ -176,8 +173,8 @@ class EmbeddedWorkerTestHelper : public IPC::Sender, protected: // StartWorker IPC handler routed through MockEmbeddedWorkerInstanceClient. - // This simulates each legacy IPC sent from the renderer and binds |request| - // to MockServiceWorkerEventDispatcher by default. + // This simulates behaviors in the renderer process. Binds + // |dispatcher_request| to MockServiceWorkerEventDispatcher by default. virtual void OnStartWorker( int embedded_worker_id, int64_t service_worker_version_id, @@ -186,7 +183,6 @@ class EmbeddedWorkerTestHelper : public IPC::Sender, bool pause_after_download, mojom::ServiceWorkerEventDispatcherRequest dispatcher_request, mojom::ControllerServiceWorkerRequest controller_request, - blink::mojom::ServiceWorkerHostAssociatedPtrInfo service_worker_host, mojom::EmbeddedWorkerInstanceHostAssociatedPtrInfo instance_host, mojom::ServiceWorkerProviderInfoForStartWorkerPtr provider_info, blink::mojom::ServiceWorkerInstalledScriptsInfoPtr @@ -203,6 +199,8 @@ class EmbeddedWorkerTestHelper : public IPC::Sender, callback); virtual void OnBackgroundFetchAbortEvent( const std::string& developer_id, + const std::string& unique_id, + const std::vector<BackgroundFetchSettledFetch>& fetches, mojom::ServiceWorkerEventDispatcher:: DispatchBackgroundFetchAbortEventCallback callback); virtual void OnBackgroundFetchClickEvent( @@ -212,6 +210,7 @@ class EmbeddedWorkerTestHelper : public IPC::Sender, DispatchBackgroundFetchClickEventCallback callback); virtual void OnBackgroundFetchFailEvent( const std::string& developer_id, + const std::string& unique_id, const std::vector<BackgroundFetchSettledFetch>& fetches, mojom::ServiceWorkerEventDispatcher:: DispatchBackgroundFetchFailEventCallback callback); @@ -221,6 +220,11 @@ class EmbeddedWorkerTestHelper : public IPC::Sender, const std::vector<BackgroundFetchSettledFetch>& fetches, mojom::ServiceWorkerEventDispatcher:: DispatchBackgroundFetchedEventCallback callback); + virtual void OnCookieChangeEvent( + const net::CanonicalCookie& cookie, + ::network::mojom::CookieChangeCause cause, + mojom::ServiceWorkerEventDispatcher::DispatchCookieChangeEventCallback + callback); virtual void OnExtendableMessageEvent( mojom::ExtendableMessageEventPtr event, mojom::ServiceWorkerEventDispatcher:: @@ -277,6 +281,11 @@ class EmbeddedWorkerTestHelper : public IPC::Sender, EmbeddedWorkerRegistry* registry(); + blink::mojom::ServiceWorkerHost* GetServiceWorkerHost( + int embedded_worker_id) { + return embedded_worker_id_host_map_[embedded_worker_id].get(); + } + private: class MockServiceWorkerEventDispatcher; class MockRendererInterface; @@ -284,6 +293,10 @@ class EmbeddedWorkerTestHelper : public IPC::Sender, void DidSimulateWorkerScriptCached(int embedded_worker_id, bool pause_after_download); + void OnInitializeGlobalScope( + int embedded_worker_id, + blink::mojom::ServiceWorkerHostAssociatedPtrInfo service_worker_host, + blink::mojom::ServiceWorkerRegistrationObjectInfoPtr registration_info); void OnStartWorkerStub(mojom::EmbeddedWorkerStartParamsPtr params); void OnResumeAfterDownloadStub(int embedded_worker_id); void OnStopWorkerStub(int embedded_worker_id); @@ -292,6 +305,8 @@ class EmbeddedWorkerTestHelper : public IPC::Sender, callback); void OnBackgroundFetchAbortEventStub( const std::string& developer_id, + const std::string& unique_id, + const std::vector<BackgroundFetchSettledFetch>& fetches, mojom::ServiceWorkerEventDispatcher:: DispatchBackgroundFetchAbortEventCallback callback); void OnBackgroundFetchClickEventStub( @@ -301,6 +316,7 @@ class EmbeddedWorkerTestHelper : public IPC::Sender, DispatchBackgroundFetchClickEventCallback callback); void OnBackgroundFetchFailEventStub( const std::string& developer_id, + const std::string& unique_id, const std::vector<BackgroundFetchSettledFetch>& fetches, mojom::ServiceWorkerEventDispatcher:: DispatchBackgroundFetchFailEventCallback callback); @@ -310,6 +326,11 @@ class EmbeddedWorkerTestHelper : public IPC::Sender, const std::vector<BackgroundFetchSettledFetch>& fetches, mojom::ServiceWorkerEventDispatcher:: DispatchBackgroundFetchedEventCallback callback); + void OnCookieChangeEventStub( + const net::CanonicalCookie& cookie, + ::network::mojom::CookieChangeCause cause, + mojom::ServiceWorkerEventDispatcher::DispatchCookieChangeEventCallback + callback); void OnExtendableMessageEventStub( mojom::ExtendableMessageEventPtr event, mojom::ServiceWorkerEventDispatcher:: @@ -318,7 +339,7 @@ class EmbeddedWorkerTestHelper : public IPC::Sender, mojom::ServiceWorkerEventDispatcher::DispatchInstallEventCallback callback); void OnFetchEventStub( - int thread_id, + int embedded_worker_id, const network::ResourceRequest& request, mojom::FetchEventPreloadHandlePtr preload_handle, mojom::ServiceWorkerFetchResponseCallbackPtr response_callback, @@ -375,8 +396,6 @@ class EmbeddedWorkerTestHelper : public IPC::Sender, dispatcher_hosts_; std::map<int, int64_t> embedded_worker_id_service_worker_version_id_map_; - std::map<int /* thread_id */, int /* embedded_worker_id */> - thread_id_embedded_worker_id_map_; std::map< int /* embedded_worker_id */, @@ -387,6 +406,14 @@ class EmbeddedWorkerTestHelper : public IPC::Sender, std::map<int /* embedded_worker_id */, blink::mojom::ServiceWorkerInstalledScriptsInfoPtr> embedded_worker_id_installed_scripts_info_map_; + std::map< + int /* embedded_worker_id */, + blink::mojom::ServiceWorkerHostAssociatedPtr /* service_worker_host */> + embedded_worker_id_host_map_; + std::map<int /* embedded_worker_id */, + blink::mojom:: + ServiceWorkerRegistrationObjectInfoPtr /* registration_info */> + embedded_worker_id_registration_info_map_; std::vector<Event> events_; scoped_refptr<URLLoaderFactoryGetter> url_loader_factory_getter_; |