| Index: content/public/test/mock_render_process_host.h
|
| diff --git a/content/public/test/mock_render_process_host.h b/content/public/test/mock_render_process_host.h
|
| index 4bae5a119424eb03a062a4806e5265b35f47f504..802b7126a61d37835e15f66d578372589dc6a76c 100644
|
| --- a/content/public/test/mock_render_process_host.h
|
| +++ b/content/public/test/mock_render_process_host.h
|
| @@ -23,7 +23,7 @@ class MockRenderProcessHostFactory;
|
| class MockRenderProcessHost : public RenderProcessHost {
|
| public:
|
| explicit MockRenderProcessHost(BrowserContext* browser_context);
|
| - virtual ~MockRenderProcessHost();
|
| + ~MockRenderProcessHost() override;
|
|
|
| // Provides access to all IPC messages that would have been sent to the
|
| // renderer via this RenderProcessHost.
|
| @@ -33,63 +33,61 @@ class MockRenderProcessHost : public RenderProcessHost {
|
| int bad_msg_count() const { return bad_msg_count_; }
|
|
|
| // RenderProcessHost implementation (public portion).
|
| - virtual void EnableSendQueue() override;
|
| - virtual bool Init() override;
|
| - virtual int GetNextRoutingID() override;
|
| - virtual void AddRoute(int32 routing_id, IPC::Listener* listener) override;
|
| - virtual void RemoveRoute(int32 routing_id) override;
|
| - virtual void AddObserver(RenderProcessHostObserver* observer) override;
|
| - virtual void RemoveObserver(RenderProcessHostObserver* observer) override;
|
| - virtual void ReceivedBadMessage() override;
|
| - virtual void WidgetRestored() override;
|
| - virtual void WidgetHidden() override;
|
| - virtual int VisibleWidgetCount() const override;
|
| - virtual bool IsIsolatedGuest() const override;
|
| - virtual StoragePartition* GetStoragePartition() const override;
|
| + void EnableSendQueue() override;
|
| + bool Init() override;
|
| + int GetNextRoutingID() override;
|
| + void AddRoute(int32 routing_id, IPC::Listener* listener) override;
|
| + void RemoveRoute(int32 routing_id) override;
|
| + void AddObserver(RenderProcessHostObserver* observer) override;
|
| + void RemoveObserver(RenderProcessHostObserver* observer) override;
|
| + void ReceivedBadMessage() override;
|
| + void WidgetRestored() override;
|
| + void WidgetHidden() override;
|
| + int VisibleWidgetCount() const override;
|
| + bool IsIsolatedGuest() const override;
|
| + StoragePartition* GetStoragePartition() const override;
|
| virtual void AddWord(const base::string16& word);
|
| - virtual bool FastShutdownIfPossible() override;
|
| - virtual bool FastShutdownStarted() const override;
|
| - virtual void DumpHandles() override;
|
| - virtual base::ProcessHandle GetHandle() const override;
|
| - virtual int GetID() const override;
|
| - virtual bool HasConnection() const override;
|
| - virtual void SetIgnoreInputEvents(bool ignore_input_events) override;
|
| - virtual bool IgnoreInputEvents() const override;
|
| - virtual void Cleanup() override;
|
| - virtual void AddPendingView() override;
|
| - virtual void RemovePendingView() override;
|
| - virtual void SetSuddenTerminationAllowed(bool allowed) override;
|
| - virtual bool SuddenTerminationAllowed() const override;
|
| - virtual BrowserContext* GetBrowserContext() const override;
|
| - virtual bool InSameStoragePartition(
|
| - StoragePartition* partition) const override;
|
| - virtual IPC::ChannelProxy* GetChannel() override;
|
| - virtual void AddFilter(BrowserMessageFilter* filter) override;
|
| - virtual bool FastShutdownForPageCount(size_t count) override;
|
| - virtual base::TimeDelta GetChildProcessIdleTime() const override;
|
| - virtual void ResumeRequestsForView(int route_id) override;
|
| - virtual void FilterURL(bool empty_allowed, GURL* url) override;
|
| + bool FastShutdownIfPossible() override;
|
| + bool FastShutdownStarted() const override;
|
| + void DumpHandles() override;
|
| + base::ProcessHandle GetHandle() const override;
|
| + int GetID() const override;
|
| + bool HasConnection() const override;
|
| + void SetIgnoreInputEvents(bool ignore_input_events) override;
|
| + bool IgnoreInputEvents() const override;
|
| + void Cleanup() override;
|
| + void AddPendingView() override;
|
| + void RemovePendingView() override;
|
| + void SetSuddenTerminationAllowed(bool allowed) override;
|
| + bool SuddenTerminationAllowed() const override;
|
| + BrowserContext* GetBrowserContext() const override;
|
| + bool InSameStoragePartition(StoragePartition* partition) const override;
|
| + IPC::ChannelProxy* GetChannel() override;
|
| + void AddFilter(BrowserMessageFilter* filter) override;
|
| + bool FastShutdownForPageCount(size_t count) override;
|
| + base::TimeDelta GetChildProcessIdleTime() const override;
|
| + void ResumeRequestsForView(int route_id) override;
|
| + void FilterURL(bool empty_allowed, GURL* url) override;
|
| #if defined(ENABLE_WEBRTC)
|
| - virtual void EnableAecDump(const base::FilePath& file) override;
|
| - virtual void DisableAecDump() override;
|
| - virtual void SetWebRtcLogMessageCallback(
|
| + void EnableAecDump(const base::FilePath& file) override;
|
| + void DisableAecDump() override;
|
| + void SetWebRtcLogMessageCallback(
|
| base::Callback<void(const std::string&)> callback) override;
|
| - virtual WebRtcStopRtpDumpCallback StartRtpDump(
|
| + WebRtcStopRtpDumpCallback StartRtpDump(
|
| bool incoming,
|
| bool outgoing,
|
| const WebRtcRtpPacketCallback& packet_callback) override;
|
| #endif
|
| - virtual void ResumeDeferredNavigation(const GlobalRequestID& request_id)
|
| - override;
|
| - virtual void NotifyTimezoneChange() override;
|
| - virtual ServiceRegistry* GetServiceRegistry() override;
|
| + void ResumeDeferredNavigation(const GlobalRequestID& request_id) override;
|
| + void NotifyTimezoneChange() override;
|
| + ServiceRegistry* GetServiceRegistry() override;
|
|
|
| // IPC::Sender via RenderProcessHost.
|
| - virtual bool Send(IPC::Message* msg) override;
|
| + bool Send(IPC::Message* msg) override;
|
|
|
| // IPC::Listener via RenderProcessHost.
|
| - virtual bool OnMessageReceived(const IPC::Message& msg) override;
|
| - virtual void OnChannelConnected(int32 peer_pid) override;
|
| + bool OnMessageReceived(const IPC::Message& msg) override;
|
| + void OnChannelConnected(int32 peer_pid) override;
|
|
|
| // Attaches the factory object so we can remove this object in its destructor
|
| // and prevent MockRenderProcessHostFacotry from deleting it.
|
| @@ -130,9 +128,9 @@ class MockRenderProcessHost : public RenderProcessHost {
|
| class MockRenderProcessHostFactory : public RenderProcessHostFactory {
|
| public:
|
| MockRenderProcessHostFactory();
|
| - virtual ~MockRenderProcessHostFactory();
|
| + ~MockRenderProcessHostFactory() override;
|
|
|
| - virtual RenderProcessHost* CreateRenderProcessHost(
|
| + RenderProcessHost* CreateRenderProcessHost(
|
| BrowserContext* browser_context,
|
| SiteInstance* site_instance) const override;
|
|
|
|
|