Index: content/browser/frame_host/render_frame_message_filter.h |
diff --git a/content/browser/frame_host/render_frame_message_filter.h b/content/browser/frame_host/render_frame_message_filter.h |
index f33be95a852985ba1770eee2e0fdb67237e2ddfc..58460bc7a9b8c821008743e52d81fbd864060ccd 100644 |
--- a/content/browser/frame_host/render_frame_message_filter.h |
+++ b/content/browser/frame_host/render_frame_message_filter.h |
@@ -10,6 +10,8 @@ |
#include <set> |
#include "content/common/frame_replication_state.h" |
+#include "content/common/render_frame_message_filter.mojom.h" |
+#include "content/public/browser/browser_associated_interface.h" |
#include "content/public/browser/browser_message_filter.h" |
#include "content/public/common/three_d_api_types.h" |
#include "net/cookies/canonical_cookie.h" |
@@ -41,7 +43,10 @@ struct WebPluginInfo; |
// with the routing id for a newly created RenderFrame. |
// |
// This object is created on the UI thread and used on the IO thread. |
-class CONTENT_EXPORT RenderFrameMessageFilter : public BrowserMessageFilter { |
+class CONTENT_EXPORT RenderFrameMessageFilter |
+ : public BrowserMessageFilter, |
+ public BrowserAssociatedInterface<mojom::RenderFrameMessageFilter>, |
+ public NON_EXPORTED_BASE(mojom::RenderFrameMessageFilter) { |
public: |
RenderFrameMessageFilter(int render_process_id, |
PluginServiceImpl* plugin_service, |
@@ -51,6 +56,7 @@ class CONTENT_EXPORT RenderFrameMessageFilter : public BrowserMessageFilter { |
// BrowserMessageFilter methods: |
bool OnMessageReceived(const IPC::Message& message) override; |
+ void OnDestruct() const override; |
protected: |
friend class TestSaveImageFromDataURL; |
@@ -64,6 +70,9 @@ class CONTENT_EXPORT RenderFrameMessageFilter : public BrowserMessageFilter { |
const bool use_prompt) const; |
private: |
+ friend class BrowserThread; |
+ friend class base::DeleteHelper<RenderFrameMessageFilter>; |
+ |
class OpenChannelToPpapiPluginCallback; |
class OpenChannelToPpapiBrokerCallback; |
@@ -71,10 +80,6 @@ class CONTENT_EXPORT RenderFrameMessageFilter : public BrowserMessageFilter { |
void OnCreateChildFrame(const FrameHostMsg_CreateChildFrame_Params& params, |
int* new_render_frame_id); |
- void OnSetCookie(int render_frame_id, |
- const GURL& url, |
- const GURL& first_party_for_cookies, |
- const std::string& cookie); |
void OnGetCookies(int render_frame_id, |
const GURL& url, |
const GURL& first_party_for_cookies, |
@@ -112,6 +117,13 @@ class CONTENT_EXPORT RenderFrameMessageFilter : public BrowserMessageFilter { |
void OnRenderProcessGone(); |
+ // mojom::RenderFrameMessageFilter: |
+ void SetCookie(int32_t render_frame_id, |
+ const GURL& url, |
+ const GURL& first_party_for_cookies, |
+ const mojo::String& cookie) override; |
+ |
+ |
#if defined(ENABLE_PLUGINS) |
void OnGetPlugins(bool refresh, IPC::Message* reply_msg); |
void GetPluginsCallback(IPC::Message* reply_msg, |