diff options
174 files changed, 390 insertions, 798 deletions
diff --git a/android_webview/browser/aw_content_browser_client.cc b/android_webview/browser/aw_content_browser_client.cc index 1ba73c7..be21678 100644 --- a/android_webview/browser/aw_content_browser_client.cc +++ b/android_webview/browser/aw_content_browser_client.cc @@ -52,8 +52,7 @@ public: const IPC::Message& message, BrowserThread::ID* thread) OVERRIDE; virtual bool OnMessageReceived( - const IPC::Message& message, - bool* message_was_ok) OVERRIDE; + const IPC::Message& message) OVERRIDE; void OnShouldOverrideUrlLoading(int routing_id, const base::string16& url, @@ -83,14 +82,13 @@ void AwContentsMessageFilter::OverrideThreadForMessage( } } -bool AwContentsMessageFilter::OnMessageReceived(const IPC::Message& message, - bool* message_was_ok) { +bool AwContentsMessageFilter::OnMessageReceived(const IPC::Message& message) { bool handled = true; - IPC_BEGIN_MESSAGE_MAP_EX(AwContentsMessageFilter, message, *message_was_ok) - IPC_MESSAGE_HANDLER(AwViewHostMsg_ShouldOverrideUrlLoading, - OnShouldOverrideUrlLoading) - IPC_MESSAGE_HANDLER(AwViewHostMsg_SubFrameCreated, OnSubFrameCreated) - IPC_MESSAGE_UNHANDLED(handled = false) + IPC_BEGIN_MESSAGE_MAP(AwContentsMessageFilter, message) + IPC_MESSAGE_HANDLER(AwViewHostMsg_ShouldOverrideUrlLoading, + OnShouldOverrideUrlLoading) + IPC_MESSAGE_HANDLER(AwViewHostMsg_SubFrameCreated, OnSubFrameCreated) + IPC_MESSAGE_UNHANDLED(handled = false) IPC_END_MESSAGE_MAP() return handled; } diff --git a/chrome/browser/chrome_net_benchmarking_message_filter.cc b/chrome/browser/chrome_net_benchmarking_message_filter.cc index 35c771c..1b01f1d 100644 --- a/chrome/browser/chrome_net_benchmarking_message_filter.cc +++ b/chrome/browser/chrome_net_benchmarking_message_filter.cc @@ -43,10 +43,9 @@ ChromeNetBenchmarkingMessageFilter::~ChromeNetBenchmarkingMessageFilter() { } bool ChromeNetBenchmarkingMessageFilter::OnMessageReceived( - const IPC::Message& message, bool* message_was_ok) { + const IPC::Message& message) { bool handled = true; - IPC_BEGIN_MESSAGE_MAP_EX(ChromeNetBenchmarkingMessageFilter, message, - *message_was_ok) + IPC_BEGIN_MESSAGE_MAP(ChromeNetBenchmarkingMessageFilter, message) IPC_MESSAGE_HANDLER(ChromeViewHostMsg_CloseCurrentConnections, OnCloseCurrentConnections) IPC_MESSAGE_HANDLER_DELAY_REPLY(ChromeViewHostMsg_ClearCache, OnClearCache) @@ -55,7 +54,7 @@ bool ChromeNetBenchmarkingMessageFilter::OnMessageReceived( IPC_MESSAGE_HANDLER(ChromeViewHostMsg_ClearPredictorCache, OnClearPredictorCache) IPC_MESSAGE_UNHANDLED(handled = false) - IPC_END_MESSAGE_MAP_EX() + IPC_END_MESSAGE_MAP() return handled; } diff --git a/chrome/browser/chrome_net_benchmarking_message_filter.h b/chrome/browser/chrome_net_benchmarking_message_filter.h index bb78496..7600dc5 100644 --- a/chrome/browser/chrome_net_benchmarking_message_filter.h +++ b/chrome/browser/chrome_net_benchmarking_message_filter.h @@ -23,8 +23,7 @@ class ChromeNetBenchmarkingMessageFilter net::URLRequestContextGetter* request_context); // content::BrowserMessageFilter methods: - virtual bool OnMessageReceived(const IPC::Message& message, - bool* message_was_ok) OVERRIDE; + virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; private: virtual ~ChromeNetBenchmarkingMessageFilter(); diff --git a/chrome/browser/media/cast_transport_host_filter.cc b/chrome/browser/media/cast_transport_host_filter.cc index 2a06a5a..3db29fc 100644 --- a/chrome/browser/media/cast_transport_host_filter.cc +++ b/chrome/browser/media/cast_transport_host_filter.cc @@ -22,10 +22,9 @@ CastTransportHostFilter::CastTransportHostFilter() CastTransportHostFilter::~CastTransportHostFilter() {} -bool CastTransportHostFilter::OnMessageReceived(const IPC::Message& message, - bool* message_was_ok) { +bool CastTransportHostFilter::OnMessageReceived(const IPC::Message& message) { bool handled = true; - IPC_BEGIN_MESSAGE_MAP_EX(CastTransportHostFilter, message, *message_was_ok) + IPC_BEGIN_MESSAGE_MAP(CastTransportHostFilter, message) IPC_MESSAGE_HANDLER(CastHostMsg_New, OnNew) IPC_MESSAGE_HANDLER(CastHostMsg_Delete, OnDelete) IPC_MESSAGE_HANDLER(CastHostMsg_InitializeAudio, OnInitializeAudio) @@ -39,7 +38,7 @@ bool CastTransportHostFilter::OnMessageReceived(const IPC::Message& message, IPC_MESSAGE_HANDLER(CastHostMsg_ResendPackets, OnResendPackets) IPC_MESSAGE_UNHANDLED(handled = false); - IPC_END_MESSAGE_MAP_EX(); + IPC_END_MESSAGE_MAP(); return handled; } diff --git a/chrome/browser/media/cast_transport_host_filter.h b/chrome/browser/media/cast_transport_host_filter.h index 46830db..5ee545e 100644 --- a/chrome/browser/media/cast_transport_host_filter.h +++ b/chrome/browser/media/cast_transport_host_filter.h @@ -31,8 +31,7 @@ class CastTransportHostFilter : public content::BrowserMessageFilter { const std::vector<media::cast::PacketEvent>& packet_events); // BrowserMessageFilter implementation. - virtual bool OnMessageReceived(const IPC::Message& message, - bool* message_was_ok) OVERRIDE; + virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; // Forwarding functions. void OnInitializeAudio( diff --git a/chrome/browser/media/cast_transport_host_filter_unittest.cc b/chrome/browser/media/cast_transport_host_filter_unittest.cc index e85b223..1ffdc4d 100644 --- a/chrome/browser/media/cast_transport_host_filter_unittest.cc +++ b/chrome/browser/media/cast_transport_host_filter_unittest.cc @@ -30,9 +30,7 @@ class CastTransportHostFilterTest : public testing::Test { protected: void FakeSend(const IPC::Message& message) { - bool message_was_ok; - EXPECT_TRUE(filter_->OnMessageReceived(message, &message_was_ok)); - EXPECT_TRUE(message_was_ok); + EXPECT_TRUE(filter_->OnMessageReceived(message)); } content::TestBrowserThreadBundle browser_thread_bundle_; diff --git a/chrome/browser/media/webrtc_logging_handler_host.cc b/chrome/browser/media/webrtc_logging_handler_host.cc index 816be38..cd0bdeda7 100644 --- a/chrome/browser/media/webrtc_logging_handler_host.cc +++ b/chrome/browser/media/webrtc_logging_handler_host.cc @@ -262,16 +262,15 @@ void WebRtcLoggingHandlerHost::OnDestruct() const { BrowserThread::DeleteOnIOThread::Destruct(this); } -bool WebRtcLoggingHandlerHost::OnMessageReceived(const IPC::Message& message, - bool* message_was_ok) { +bool WebRtcLoggingHandlerHost::OnMessageReceived(const IPC::Message& message) { DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); bool handled = true; - IPC_BEGIN_MESSAGE_MAP_EX(WebRtcLoggingHandlerHost, message, *message_was_ok) + IPC_BEGIN_MESSAGE_MAP(WebRtcLoggingHandlerHost, message) IPC_MESSAGE_HANDLER(WebRtcLoggingMsg_AddLogMessages, OnAddLogMessages) IPC_MESSAGE_HANDLER(WebRtcLoggingMsg_LoggingStopped, OnLoggingStoppedInRenderer) IPC_MESSAGE_UNHANDLED(handled = false) - IPC_END_MESSAGE_MAP_EX() + IPC_END_MESSAGE_MAP() return handled; } diff --git a/chrome/browser/media/webrtc_logging_handler_host.h b/chrome/browser/media/webrtc_logging_handler_host.h index 835fbda..002d4a4 100644 --- a/chrome/browser/media/webrtc_logging_handler_host.h +++ b/chrome/browser/media/webrtc_logging_handler_host.h @@ -117,8 +117,7 @@ class WebRtcLoggingHandlerHost : public content::BrowserMessageFilter { // BrowserMessageFilter implementation. virtual void OnChannelClosing() OVERRIDE; virtual void OnDestruct() const OVERRIDE; - virtual bool OnMessageReceived(const IPC::Message& message, - bool* message_was_ok) OVERRIDE; + virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; // Handles log message requests from renderer process. void OnAddLogMessages(const std::vector<WebRtcLoggingMessageData>& messages); diff --git a/chrome/browser/plugins/plugin_info_message_filter.cc b/chrome/browser/plugins/plugin_info_message_filter.cc index 85b0995..12dc33d 100644 --- a/chrome/browser/plugins/plugin_info_message_filter.cc +++ b/chrome/browser/plugins/plugin_info_message_filter.cc @@ -96,9 +96,8 @@ PluginInfoMessageFilter::PluginInfoMessageFilter( weak_ptr_factory_(this) { } -bool PluginInfoMessageFilter::OnMessageReceived(const IPC::Message& message, - bool* message_was_ok) { - IPC_BEGIN_MESSAGE_MAP_EX(PluginInfoMessageFilter, message, *message_was_ok) +bool PluginInfoMessageFilter::OnMessageReceived(const IPC::Message& message) { + IPC_BEGIN_MESSAGE_MAP(PluginInfoMessageFilter, message) IPC_MESSAGE_HANDLER_DELAY_REPLY(ChromeViewHostMsg_GetPluginInfo, OnGetPluginInfo) IPC_MESSAGE_HANDLER( diff --git a/chrome/browser/plugins/plugin_info_message_filter.h b/chrome/browser/plugins/plugin_info_message_filter.h index fb1744d..09ad590 100644 --- a/chrome/browser/plugins/plugin_info_message_filter.h +++ b/chrome/browser/plugins/plugin_info_message_filter.h @@ -78,8 +78,7 @@ class PluginInfoMessageFilter : public content::BrowserMessageFilter { PluginInfoMessageFilter(int render_process_id, Profile* profile); // content::BrowserMessageFilter methods: - virtual bool OnMessageReceived(const IPC::Message& message, - bool* message_was_ok) OVERRIDE; + virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; virtual void OnDestruct() const OVERRIDE; private: diff --git a/chrome/browser/prerender/prerender_browsertest.cc b/chrome/browser/prerender/prerender_browsertest.cc index 998d954..1d6a792 100644 --- a/chrome/browser/prerender/prerender_browsertest.cc +++ b/chrome/browser/prerender/prerender_browsertest.cc @@ -222,8 +222,7 @@ class ChannelDestructionWatcher { base::Unretained(watcher_))); } - virtual bool OnMessageReceived(const IPC::Message& message, - bool* message_was_ok) OVERRIDE { + virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE { return false; } diff --git a/chrome/browser/prerender/prerender_message_filter.cc b/chrome/browser/prerender/prerender_message_filter.cc index 808c23e..14b6beb 100644 --- a/chrome/browser/prerender/prerender_message_filter.cc +++ b/chrome/browser/prerender/prerender_message_filter.cc @@ -41,10 +41,9 @@ PrerenderMessageFilter::PrerenderMessageFilter(int render_process_id, PrerenderMessageFilter::~PrerenderMessageFilter() { } -bool PrerenderMessageFilter::OnMessageReceived(const IPC::Message& message, - bool* message_was_ok) { +bool PrerenderMessageFilter::OnMessageReceived(const IPC::Message& message) { bool handled = true; - IPC_BEGIN_MESSAGE_MAP_EX(PrerenderMessageFilter, message, *message_was_ok) + IPC_BEGIN_MESSAGE_MAP(PrerenderMessageFilter, message) IPC_MESSAGE_HANDLER(PrerenderHostMsg_AddLinkRelPrerender, OnAddPrerender) IPC_MESSAGE_HANDLER( PrerenderHostMsg_CancelLinkRelPrerender, OnCancelPrerender) diff --git a/chrome/browser/prerender/prerender_message_filter.h b/chrome/browser/prerender/prerender_message_filter.h index a5a7ac6..4c329bc 100644 --- a/chrome/browser/prerender/prerender_message_filter.h +++ b/chrome/browser/prerender/prerender_message_filter.h @@ -34,8 +34,7 @@ class PrerenderMessageFilter : public content::BrowserMessageFilter { virtual ~PrerenderMessageFilter(); // Overridden from content::BrowserMessageFilter. - virtual bool OnMessageReceived(const IPC::Message& message, - bool* message_was_ok) OVERRIDE; + virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; virtual void OverrideThreadForMessage( const IPC::Message& message, content::BrowserThread::ID* thread) OVERRIDE; diff --git a/chrome/browser/printing/printing_message_filter.cc b/chrome/browser/printing/printing_message_filter.cc index 421cf49..485cff6 100644 --- a/chrome/browser/printing/printing_message_filter.cc +++ b/chrome/browser/printing/printing_message_filter.cc @@ -115,10 +115,9 @@ void PrintingMessageFilter::OverrideThreadForMessage( #endif } -bool PrintingMessageFilter::OnMessageReceived(const IPC::Message& message, - bool* message_was_ok) { +bool PrintingMessageFilter::OnMessageReceived(const IPC::Message& message) { bool handled = true; - IPC_BEGIN_MESSAGE_MAP_EX(PrintingMessageFilter, message, *message_was_ok) + IPC_BEGIN_MESSAGE_MAP(PrintingMessageFilter, message) #if defined(OS_WIN) IPC_MESSAGE_HANDLER(PrintHostMsg_DuplicateSection, OnDuplicateSection) #endif diff --git a/chrome/browser/printing/printing_message_filter.h b/chrome/browser/printing/printing_message_filter.h index 3c0bf88..7a16d2e 100644 --- a/chrome/browser/printing/printing_message_filter.h +++ b/chrome/browser/printing/printing_message_filter.h @@ -43,8 +43,7 @@ class PrintingMessageFilter : public content::BrowserMessageFilter { virtual void OverrideThreadForMessage( const IPC::Message& message, content::BrowserThread::ID* thread) OVERRIDE; - virtual bool OnMessageReceived(const IPC::Message& message, - bool* message_was_ok) OVERRIDE; + virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; private: virtual ~PrintingMessageFilter(); diff --git a/chrome/browser/renderer_host/chrome_render_message_filter.cc b/chrome/browser/renderer_host/chrome_render_message_filter.cc index bb0ed1b..14a36a3 100644 --- a/chrome/browser/renderer_host/chrome_render_message_filter.cc +++ b/chrome/browser/renderer_host/chrome_render_message_filter.cc @@ -96,10 +96,9 @@ ChromeRenderMessageFilter::ChromeRenderMessageFilter( ChromeRenderMessageFilter::~ChromeRenderMessageFilter() { } -bool ChromeRenderMessageFilter::OnMessageReceived(const IPC::Message& message, - bool* message_was_ok) { +bool ChromeRenderMessageFilter::OnMessageReceived(const IPC::Message& message) { bool handled = true; - IPC_BEGIN_MESSAGE_MAP_EX(ChromeRenderMessageFilter, message, *message_was_ok) + IPC_BEGIN_MESSAGE_MAP(ChromeRenderMessageFilter, message) IPC_MESSAGE_HANDLER(ChromeViewHostMsg_DnsPrefetch, OnDnsPrefetch) IPC_MESSAGE_HANDLER(ChromeViewHostMsg_Preconnect, OnPreconnect) IPC_MESSAGE_HANDLER(ChromeViewHostMsg_ResourceTypeStats, diff --git a/chrome/browser/renderer_host/chrome_render_message_filter.h b/chrome/browser/renderer_host/chrome_render_message_filter.h index 7763c13..9270a04 100644 --- a/chrome/browser/renderer_host/chrome_render_message_filter.h +++ b/chrome/browser/renderer_host/chrome_render_message_filter.h @@ -52,8 +52,7 @@ class ChromeRenderMessageFilter : public content::BrowserMessageFilter { }; // content::BrowserMessageFilter methods: - virtual bool OnMessageReceived(const IPC::Message& message, - bool* message_was_ok) OVERRIDE; + virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; virtual void OverrideThreadForMessage( const IPC::Message& message, content::BrowserThread::ID* thread) OVERRIDE; diff --git a/chrome/browser/search_engines/search_provider_install_state_message_filter.cc b/chrome/browser/search_engines/search_provider_install_state_message_filter.cc index c4ca4a0..a7ea757 100644 --- a/chrome/browser/search_engines/search_provider_install_state_message_filter.cc +++ b/chrome/browser/search_engines/search_provider_install_state_message_filter.cc @@ -31,12 +31,10 @@ SearchProviderInstallStateMessageFilter( } bool SearchProviderInstallStateMessageFilter::OnMessageReceived( - const IPC::Message& message, - bool* message_was_ok) { + const IPC::Message& message) { DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); bool handled = true; - IPC_BEGIN_MESSAGE_MAP_EX(SearchProviderInstallStateMessageFilter, message, - *message_was_ok) + IPC_BEGIN_MESSAGE_MAP(SearchProviderInstallStateMessageFilter, message) IPC_MESSAGE_HANDLER_DELAY_REPLY( ChromeViewHostMsg_GetSearchProviderInstallState, OnGetSearchProviderInstallState) diff --git a/chrome/browser/search_engines/search_provider_install_state_message_filter.h b/chrome/browser/search_engines/search_provider_install_state_message_filter.h index 8aa9c9c..a15601d 100644 --- a/chrome/browser/search_engines/search_provider_install_state_message_filter.h +++ b/chrome/browser/search_engines/search_provider_install_state_message_filter.h @@ -22,8 +22,7 @@ class SearchProviderInstallStateMessageFilter Profile* profile); // content::BrowserMessageFilter implementation. - virtual bool OnMessageReceived(const IPC::Message& message, - bool* message_was_ok) OVERRIDE; + virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; private: virtual ~SearchProviderInstallStateMessageFilter(); diff --git a/chrome/browser/signin/principals_message_filter.cc b/chrome/browser/signin/principals_message_filter.cc index d047d80..ef8dd50 100644 --- a/chrome/browser/signin/principals_message_filter.cc +++ b/chrome/browser/signin/principals_message_filter.cc @@ -22,10 +22,9 @@ void PrincipalsMessageFilter::OverrideThreadForMessage( *thread = content::BrowserThread::UI; } -bool PrincipalsMessageFilter::OnMessageReceived(const IPC::Message& message, - bool* message_was_ok) { +bool PrincipalsMessageFilter::OnMessageReceived(const IPC::Message& message) { bool handled = true; - IPC_BEGIN_MESSAGE_MAP_EX(PrincipalsMessageFilter, message, *message_was_ok) + IPC_BEGIN_MESSAGE_MAP(PrincipalsMessageFilter, message) IPC_MESSAGE_HANDLER( ChromeViewHostMsg_GetManagedAccounts, OnMsgGetManagedAccounts) IPC_MESSAGE_HANDLER( diff --git a/chrome/browser/signin/principals_message_filter.h b/chrome/browser/signin/principals_message_filter.h index 156a9a9..eb7d858 100644 --- a/chrome/browser/signin/principals_message_filter.h +++ b/chrome/browser/signin/principals_message_filter.h @@ -20,8 +20,7 @@ class PrincipalsMessageFilter : public content::BrowserMessageFilter { virtual void OverrideThreadForMessage( const IPC::Message& message, content::BrowserThread::ID* thread) OVERRIDE; - virtual bool OnMessageReceived(const IPC::Message& message, - bool* message_was_ok) OVERRIDE; + virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; private: virtual ~PrincipalsMessageFilter(); diff --git a/chrome/browser/speech/tts_message_filter.cc b/chrome/browser/speech/tts_message_filter.cc index 6488b36..789eac3 100644 --- a/chrome/browser/speech/tts_message_filter.cc +++ b/chrome/browser/speech/tts_message_filter.cc @@ -35,10 +35,9 @@ void TtsMessageFilter::OverrideThreadForMessage( } } -bool TtsMessageFilter::OnMessageReceived(const IPC::Message& message, - bool* message_was_ok) { +bool TtsMessageFilter::OnMessageReceived(const IPC::Message& message) { bool handled = true; - IPC_BEGIN_MESSAGE_MAP_EX(TtsMessageFilter, message, *message_was_ok) + IPC_BEGIN_MESSAGE_MAP(TtsMessageFilter, message) IPC_MESSAGE_HANDLER(TtsHostMsg_InitializeVoiceList, OnInitializeVoiceList) IPC_MESSAGE_HANDLER(TtsHostMsg_Speak, OnSpeak) IPC_MESSAGE_HANDLER(TtsHostMsg_Pause, OnPause) diff --git a/chrome/browser/speech/tts_message_filter.h b/chrome/browser/speech/tts_message_filter.h index b81c56c..629745c 100644 --- a/chrome/browser/speech/tts_message_filter.h +++ b/chrome/browser/speech/tts_message_filter.h @@ -24,8 +24,7 @@ class TtsMessageFilter virtual void OverrideThreadForMessage( const IPC::Message& message, content::BrowserThread::ID* thread) OVERRIDE; - virtual bool OnMessageReceived(const IPC::Message& message, - bool* message_was_ok) OVERRIDE; + virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; virtual void OnChannelClosing() OVERRIDE; // UtteranceEventDelegate implementation. diff --git a/chrome/browser/spellchecker/spellcheck_message_filter.cc b/chrome/browser/spellchecker/spellcheck_message_filter.cc index e9265dd..024ce7f 100644 --- a/chrome/browser/spellchecker/spellcheck_message_filter.cc +++ b/chrome/browser/spellchecker/spellcheck_message_filter.cc @@ -43,10 +43,9 @@ void SpellCheckMessageFilter::OverrideThreadForMessage( #endif } -bool SpellCheckMessageFilter::OnMessageReceived(const IPC::Message& message, - bool* message_was_ok) { +bool SpellCheckMessageFilter::OnMessageReceived(const IPC::Message& message) { bool handled = true; - IPC_BEGIN_MESSAGE_MAP_EX(SpellCheckMessageFilter, message, *message_was_ok) + IPC_BEGIN_MESSAGE_MAP(SpellCheckMessageFilter, message) IPC_MESSAGE_HANDLER(SpellCheckHostMsg_RequestDictionary, OnSpellCheckerRequestDictionary) IPC_MESSAGE_HANDLER(SpellCheckHostMsg_NotifyChecked, diff --git a/chrome/browser/spellchecker/spellcheck_message_filter.h b/chrome/browser/spellchecker/spellcheck_message_filter.h index fb262ff..77002cc 100644 --- a/chrome/browser/spellchecker/spellcheck_message_filter.h +++ b/chrome/browser/spellchecker/spellcheck_message_filter.h @@ -24,8 +24,7 @@ class SpellCheckMessageFilter : public content::BrowserMessageFilter { virtual void OverrideThreadForMessage( const IPC::Message& message, content::BrowserThread::ID* thread) OVERRIDE; - virtual bool OnMessageReceived(const IPC::Message& message, - bool* message_was_ok) OVERRIDE; + virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; private: friend class TestingSpellCheckMessageFilter; diff --git a/chrome/browser/spellchecker/spellcheck_message_filter_mac.cc b/chrome/browser/spellchecker/spellcheck_message_filter_mac.cc index b4eb556..d96cc55 100644 --- a/chrome/browser/spellchecker/spellcheck_message_filter_mac.cc +++ b/chrome/browser/spellchecker/spellcheck_message_filter_mac.cc @@ -200,10 +200,10 @@ void SpellCheckMessageFilterMac::OverrideThreadForMessage( *thread = BrowserThread::UI; } -bool SpellCheckMessageFilterMac::OnMessageReceived(const IPC::Message& message, - bool* message_was_ok) { +bool SpellCheckMessageFilterMac::OnMessageReceived( + const IPC::Message& message) { bool handled = true; - IPC_BEGIN_MESSAGE_MAP_EX(SpellCheckMessageFilterMac, message, *message_was_ok) + IPC_BEGIN_MESSAGE_MAP(SpellCheckMessageFilterMac, message) IPC_MESSAGE_HANDLER(SpellCheckHostMsg_CheckSpelling, OnCheckSpelling) IPC_MESSAGE_HANDLER(SpellCheckHostMsg_FillSuggestionList, diff --git a/chrome/browser/spellchecker/spellcheck_message_filter_mac.h b/chrome/browser/spellchecker/spellcheck_message_filter_mac.h index 944a1f0..dceda30 100644 --- a/chrome/browser/spellchecker/spellcheck_message_filter_mac.h +++ b/chrome/browser/spellchecker/spellcheck_message_filter_mac.h @@ -21,8 +21,7 @@ class SpellCheckMessageFilterMac : public content::BrowserMessageFilter { virtual void OverrideThreadForMessage( const IPC::Message& message, content::BrowserThread::ID* thread) OVERRIDE; - virtual bool OnMessageReceived(const IPC::Message& message, - bool* message_was_ok) OVERRIDE; + virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; // Adjusts remote_results by examining local_results. Any result that's both // local and remote stays type SPELLING, all others are flagged GRAMMAR. diff --git a/chrome/browser/spellchecker/spellcheck_message_filter_mac_browsertest.cc b/chrome/browser/spellchecker/spellcheck_message_filter_mac_browsertest.cc index 2d3efc1..1114b7c 100644 --- a/chrome/browser/spellchecker/spellcheck_message_filter_mac_browsertest.cc +++ b/chrome/browser/spellchecker/spellcheck_message_filter_mac_browsertest.cc @@ -45,9 +45,7 @@ IN_PROC_BROWSER_TEST_F(SpellCheckMessageFilterMacBrowserTest, SpellCheckHostMsg_RequestTextCheck to_be_received( 123, 456, base::UTF8ToUTF16("zz."), std::vector<SpellCheckMarker>()); - bool handled = false; - target->OnMessageReceived(to_be_received, &handled); - EXPECT_TRUE(handled); + target->OnMessageReceived(to_be_received); base::MessageLoopForUI::current()->Run(); EXPECT_EQ(1U, target->sent_messages_.size()); diff --git a/chrome/renderer/chrome_mock_render_thread.cc b/chrome/renderer/chrome_mock_render_thread.cc index fa208d9..d624e4a 100644 --- a/chrome/renderer/chrome_mock_render_thread.cc +++ b/chrome/renderer/chrome_mock_render_thread.cc @@ -53,8 +53,7 @@ bool ChromeMockRenderThread::OnMessageReceived(const IPC::Message& msg) { // Some messages we do special handling. bool handled = true; - bool msg_is_ok = true; - IPC_BEGIN_MESSAGE_MAP_EX(ChromeMockRenderThread, msg, msg_is_ok) + IPC_BEGIN_MESSAGE_MAP(ChromeMockRenderThread, msg) IPC_MESSAGE_HANDLER(ExtensionHostMsg_OpenChannelToExtension, OnOpenChannelToExtension) #if defined(ENABLE_PRINTING) @@ -80,7 +79,7 @@ bool ChromeMockRenderThread::OnMessageReceived(const IPC::Message& msg) { #endif // defined(OS_CHROMEOS) #endif // defined(ENABLE_PRINTING) IPC_MESSAGE_UNHANDLED(handled = false) - IPC_END_MESSAGE_MAP_EX() + IPC_END_MESSAGE_MAP() return handled; } diff --git a/chrome/renderer/safe_browsing/phishing_classifier_delegate_browsertest.cc b/chrome/renderer/safe_browsing/phishing_classifier_delegate_browsertest.cc index e4908e9..f86a435 100644 --- a/chrome/renderer/safe_browsing/phishing_classifier_delegate_browsertest.cc +++ b/chrome/renderer/safe_browsing/phishing_classifier_delegate_browsertest.cc @@ -87,8 +87,7 @@ class InterceptingMessageFilter : public content::BrowserMessageFilter { } const ClientPhishingRequest* verdict() const { return verdict_.get(); } - virtual bool OnMessageReceived(const IPC::Message& message, - bool* message_was_ok) OVERRIDE { + virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE { bool handled = true; IPC_BEGIN_MESSAGE_MAP(InterceptingMessageFilter, message) IPC_MESSAGE_HANDLER(SafeBrowsingHostMsg_PhishingDetectionDone, diff --git a/components/cdm/browser/cdm_message_filter_android.cc b/components/cdm/browser/cdm_message_filter_android.cc index 82dac5e..2bda860 100644 --- a/components/cdm/browser/cdm_message_filter_android.cc +++ b/components/cdm/browser/cdm_message_filter_android.cc @@ -70,15 +70,13 @@ CdmMessageFilterAndroid::CdmMessageFilterAndroid() CdmMessageFilterAndroid::~CdmMessageFilterAndroid() {} -bool CdmMessageFilterAndroid::OnMessageReceived( - const IPC::Message& message, bool* message_was_ok) { +bool CdmMessageFilterAndroid::OnMessageReceived(const IPC::Message& message) { bool handled = true; - IPC_BEGIN_MESSAGE_MAP_EX( - CdmMessageFilterAndroid, message, *message_was_ok) + IPC_BEGIN_MESSAGE_MAP(CdmMessageFilterAndroid, message) IPC_MESSAGE_HANDLER(ChromeViewHostMsg_GetSupportedKeySystems, OnGetSupportedKeySystems) IPC_MESSAGE_UNHANDLED(handled = false) - IPC_END_MESSAGE_MAP_EX() + IPC_END_MESSAGE_MAP() return handled; } diff --git a/components/cdm/browser/cdm_message_filter_android.h b/components/cdm/browser/cdm_message_filter_android.h index b639fa8..47aa445 100644 --- a/components/cdm/browser/cdm_message_filter_android.h +++ b/components/cdm/browser/cdm_message_filter_android.h @@ -24,8 +24,7 @@ class CdmMessageFilterAndroid virtual ~CdmMessageFilterAndroid(); // BrowserMessageFilter implementation. - virtual bool OnMessageReceived(const IPC::Message& message, - bool* message_was_ok) OVERRIDE; + virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; virtual void OverrideThreadForMessage( const IPC::Message& message, content::BrowserThread::ID* thread) OVERRIDE; diff --git a/components/nacl/browser/nacl_host_message_filter.cc b/components/nacl/browser/nacl_host_message_filter.cc index 6ff43f5..a421061 100644 --- a/components/nacl/browser/nacl_host_message_filter.cc +++ b/components/nacl/browser/nacl_host_message_filter.cc @@ -37,10 +37,9 @@ void NaClHostMessageFilter::OnChannelClosing() { pnacl::PnaclHost::GetInstance()->RendererClosing(render_process_id_); } -bool NaClHostMessageFilter::OnMessageReceived(const IPC::Message& message, - bool* message_was_ok) { +bool NaClHostMessageFilter::OnMessageReceived(const IPC::Message& message) { bool handled = true; - IPC_BEGIN_MESSAGE_MAP_EX(NaClHostMessageFilter, message, *message_was_ok) + IPC_BEGIN_MESSAGE_MAP(NaClHostMessageFilter, message) #if !defined(DISABLE_NACL) IPC_MESSAGE_HANDLER_DELAY_REPLY(NaClHostMsg_LaunchNaCl, OnLaunchNaCl) IPC_MESSAGE_HANDLER_DELAY_REPLY(NaClHostMsg_GetReadonlyPnaclFD, diff --git a/components/nacl/browser/nacl_host_message_filter.h b/components/nacl/browser/nacl_host_message_filter.h index 0227409..b0e991a 100644 --- a/components/nacl/browser/nacl_host_message_filter.h +++ b/components/nacl/browser/nacl_host_message_filter.h @@ -34,8 +34,7 @@ class NaClHostMessageFilter : public content::BrowserMessageFilter { net::URLRequestContextGetter* request_context); // content::BrowserMessageFilter methods: - virtual bool OnMessageReceived(const IPC::Message& message, - bool* message_was_ok) OVERRIDE; + virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; virtual void OnChannelClosing() OVERRIDE; int render_process_id() { return render_process_id_; } diff --git a/content/browser/appcache/appcache_dispatcher_host.cc b/content/browser/appcache/appcache_dispatcher_host.cc index 827a1ee..1ac788d 100644 --- a/content/browser/appcache/appcache_dispatcher_host.cc +++ b/content/browser/appcache/appcache_dispatcher_host.cc @@ -37,10 +37,9 @@ void AppCacheDispatcherHost::OnChannelConnected(int32 peer_pid) { } } -bool AppCacheDispatcherHost::OnMessageReceived(const IPC::Message& message, - bool* message_was_ok) { +bool AppCacheDispatcherHost::OnMessageReceived(const IPC::Message& message) { bool handled = true; - IPC_BEGIN_MESSAGE_MAP_EX(AppCacheDispatcherHost, message, *message_was_ok) + IPC_BEGIN_MESSAGE_MAP(AppCacheDispatcherHost, message) IPC_MESSAGE_HANDLER(AppCacheHostMsg_RegisterHost, OnRegisterHost) IPC_MESSAGE_HANDLER(AppCacheHostMsg_UnregisterHost, OnUnregisterHost) IPC_MESSAGE_HANDLER(AppCacheHostMsg_SetSpawningHostId, OnSetSpawningHostId) @@ -56,7 +55,7 @@ bool AppCacheDispatcherHost::OnMessageReceived(const IPC::Message& message, IPC_MESSAGE_HANDLER_DELAY_REPLY(AppCacheHostMsg_StartUpdate, OnStartUpdate) IPC_MESSAGE_HANDLER_DELAY_REPLY(AppCacheHostMsg_SwapCache, OnSwapCache) IPC_MESSAGE_UNHANDLED(handled = false) - IPC_END_MESSAGE_MAP_EX() + IPC_END_MESSAGE_MAP() return handled; } diff --git a/content/browser/appcache/appcache_dispatcher_host.h b/content/browser/appcache/appcache_dispatcher_host.h index 29ed69e..4ddb236 100644 --- a/content/browser/appcache/appcache_dispatcher_host.h +++ b/content/browser/appcache/appcache_dispatcher_host.h @@ -28,8 +28,7 @@ class AppCacheDispatcherHost : public BrowserMessageFilter { // BrowserIOMessageFilter implementation virtual void OnChannelConnected(int32 peer_pid) OVERRIDE; - virtual bool OnMessageReceived(const IPC::Message& message, - bool* message_was_ok) OVERRIDE; + virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; protected: virtual ~AppCacheDispatcherHost(); diff --git a/content/browser/browser_child_process_host_impl.cc b/content/browser/browser_child_process_host_impl.cc index 0c2b637..97058a6 100644 --- a/content/browser/browser_child_process_host_impl.cc +++ b/content/browser/browser_child_process_host_impl.cc @@ -261,6 +261,10 @@ void BrowserChildProcessHostImpl::OnChannelError() { void BrowserChildProcessHostImpl::OnBadMessageReceived( const IPC::Message& message) { HistogramBadMessageTerminated(data_.process_type); + if (CommandLine::ForCurrentProcess()->HasSwitch( + switches::kDisableKillAfterBadIPC)) { + return; + } base::KillProcess(GetHandle(), RESULT_CODE_KILLED_BAD_MESSAGE, false); } diff --git a/content/browser/browser_plugin/browser_plugin_message_filter.cc b/content/browser/browser_plugin/browser_plugin_message_filter.cc index cdd778e..ace1e82 100644 --- a/content/browser/browser_plugin/browser_plugin_message_filter.cc +++ b/content/browser/browser_plugin/browser_plugin_message_filter.cc @@ -31,8 +31,7 @@ BrowserPluginMessageFilter::~BrowserPluginMessageFilter() { } bool BrowserPluginMessageFilter::OnMessageReceived( - const IPC::Message& message, - bool* message_was_ok) { + const IPC::Message& message) { // Any message requested by a BrowserPluginGuest should be routed through // a BrowserPluginGuestManager. if (BrowserPluginGuest::ShouldForwardToBrowserPluginGuest(message)) { diff --git a/content/browser/browser_plugin/browser_plugin_message_filter.h b/content/browser/browser_plugin/browser_plugin_message_filter.h index 8e51253..81e94b2 100644 --- a/content/browser/browser_plugin/browser_plugin_message_filter.h +++ b/content/browser/browser_plugin/browser_plugin_message_filter.h @@ -23,8 +23,7 @@ class BrowserPluginMessageFilter : public BrowserMessageFilter { virtual void OverrideThreadForMessage( const IPC::Message& message, BrowserThread::ID* thread) OVERRIDE; - virtual bool OnMessageReceived(const IPC::Message& message, - bool* message_was_ok) OVERRIDE; + virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; virtual void OnDestruct() const OVERRIDE; private: diff --git a/content/browser/device_sensors/device_motion_message_filter.cc b/content/browser/device_sensors/device_motion_message_filter.cc index 26a3962..2994c38 100644 --- a/content/browser/device_sensors/device_motion_message_filter.cc +++ b/content/browser/device_sensors/device_motion_message_filter.cc @@ -21,19 +21,15 @@ DeviceMotionMessageFilter::~DeviceMotionMessageFilter() { CONSUMER_TYPE_MOTION); } -bool DeviceMotionMessageFilter::OnMessageReceived( - const IPC::Message& message, - bool* message_was_ok) { +bool DeviceMotionMessageFilter::OnMessageReceived(const IPC::Message& message) { bool handled = true; - IPC_BEGIN_MESSAGE_MAP_EX(DeviceMotionMessageFilter, - message, - *message_was_ok) + IPC_BEGIN_MESSAGE_MAP(DeviceMotionMessageFilter, message) IPC_MESSAGE_HANDLER(DeviceMotionHostMsg_StartPolling, OnDeviceMotionStartPolling) IPC_MESSAGE_HANDLER(DeviceMotionHostMsg_StopPolling, OnDeviceMotionStopPolling) IPC_MESSAGE_UNHANDLED(handled = false) - IPC_END_MESSAGE_MAP_EX() + IPC_END_MESSAGE_MAP() return handled; } diff --git a/content/browser/device_sensors/device_motion_message_filter.h b/content/browser/device_sensors/device_motion_message_filter.h index 5bbce9b..71ba38c2 100644 --- a/content/browser/device_sensors/device_motion_message_filter.h +++ b/content/browser/device_sensors/device_motion_message_filter.h @@ -18,8 +18,7 @@ class DeviceMotionMessageFilter : public BrowserMessageFilter { DeviceMotionMessageFilter(); // BrowserMessageFilter implementation. - virtual bool OnMessageReceived(const IPC::Message& message, - bool* message_was_ok) OVERRIDE; + virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; private: virtual ~DeviceMotionMessageFilter(); diff --git a/content/browser/device_sensors/device_orientation_message_filter.cc b/content/browser/device_sensors/device_orientation_message_filter.cc index 622c685..402aa67 100644 --- a/content/browser/device_sensors/device_orientation_message_filter.cc +++ b/content/browser/device_sensors/device_orientation_message_filter.cc @@ -22,18 +22,15 @@ DeviceOrientationMessageFilter::~DeviceOrientationMessageFilter() { } bool DeviceOrientationMessageFilter::OnMessageReceived( - const IPC::Message& message, - bool* message_was_ok) { + const IPC::Message& message) { bool handled = true; - IPC_BEGIN_MESSAGE_MAP_EX(DeviceOrientationMessageFilter, - message, - *message_was_ok) + IPC_BEGIN_MESSAGE_MAP(DeviceOrientationMessageFilter, message) IPC_MESSAGE_HANDLER(DeviceOrientationHostMsg_StartPolling, OnDeviceOrientationStartPolling) IPC_MESSAGE_HANDLER(DeviceOrientationHostMsg_StopPolling, OnDeviceOrientationStopPolling) IPC_MESSAGE_UNHANDLED(handled = false) - IPC_END_MESSAGE_MAP_EX() + IPC_END_MESSAGE_MAP() return handled; } diff --git a/content/browser/device_sensors/device_orientation_message_filter.h b/content/browser/device_sensors/device_orientation_message_filter.h index afc3ec2..6d99405 100644 --- a/content/browser/device_sensors/device_orientation_message_filter.h +++ b/content/browser/device_sensors/device_orientation_message_filter.h @@ -17,8 +17,7 @@ class DeviceOrientationMessageFilter : public BrowserMessageFilter { DeviceOrientationMessageFilter(); // BrowserMessageFilter implementation. - virtual bool OnMessageReceived(const IPC::Message& message, - bool* message_was_ok) OVERRIDE; + virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; private: virtual ~DeviceOrientationMessageFilter(); diff --git a/content/browser/devtools/worker_devtools_message_filter.cc b/content/browser/devtools/worker_devtools_message_filter.cc index 2c72dfd..23c068b 100644 --- a/content/browser/devtools/worker_devtools_message_filter.cc +++ b/content/browser/devtools/worker_devtools_message_filter.cc @@ -21,18 +21,16 @@ WorkerDevToolsMessageFilter::~WorkerDevToolsMessageFilter() { } bool WorkerDevToolsMessageFilter::OnMessageReceived( - const IPC::Message& message, - bool* message_was_ok) { + const IPC::Message& message) { bool handled = true; current_routing_id_ = message.routing_id(); - IPC_BEGIN_MESSAGE_MAP_EX(WorkerDevToolsMessageFilter, message, - *message_was_ok) + IPC_BEGIN_MESSAGE_MAP(WorkerDevToolsMessageFilter, message) IPC_MESSAGE_HANDLER(DevToolsClientMsg_DispatchOnInspectorFrontend, OnDispatchOnInspectorFrontend) IPC_MESSAGE_HANDLER(DevToolsHostMsg_SaveAgentRuntimeState, OnSaveAgentRumtimeState) IPC_MESSAGE_UNHANDLED(handled = false) - IPC_END_MESSAGE_MAP_EX() + IPC_END_MESSAGE_MAP() return handled; } diff --git a/content/browser/devtools/worker_devtools_message_filter.h b/content/browser/devtools/worker_devtools_message_filter.h index 73ba6f84..c80658e 100644 --- a/content/browser/devtools/worker_devtools_message_filter.h +++ b/content/browser/devtools/worker_devtools_message_filter.h @@ -18,8 +18,7 @@ class WorkerDevToolsMessageFilter : public BrowserMessageFilter { virtual ~WorkerDevToolsMessageFilter(); // BrowserMessageFilter implementation. - virtual bool OnMessageReceived(const IPC::Message& message, - bool* message_was_ok) OVERRIDE; + virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; // Message handlers. void OnDispatchOnInspectorFrontend(const std::string& message); void OnSaveAgentRumtimeState(const std::string& state); diff --git a/content/browser/dom_storage/dom_storage_message_filter.cc b/content/browser/dom_storage/dom_storage_message_filter.cc index 282b71d..1ed4dd8 100644 --- a/content/browser/dom_storage/dom_storage_message_filter.cc +++ b/content/browser/dom_storage/dom_storage_message_filter.cc @@ -68,15 +68,14 @@ base::TaskRunner* DOMStorageMessageFilter::OverrideTaskRunnerForMessage( return NULL; } -bool DOMStorageMessageFilter::OnMessageReceived(const IPC::Message& message, - bool* message_was_ok) { +bool DOMStorageMessageFilter::OnMessageReceived(const IPC::Message& message) { if (IPC_MESSAGE_CLASS(message) != DOMStorageMsgStart) return false; DCHECK(!BrowserThread::CurrentlyOn(BrowserThread::IO)); DCHECK(host_.get()); bool handled = true; - IPC_BEGIN_MESSAGE_MAP_EX(DOMStorageMessageFilter, message, *message_was_ok) + IPC_BEGIN_MESSAGE_MAP(DOMStorageMessageFilter, message) IPC_MESSAGE_HANDLER(DOMStorageHostMsg_OpenStorageArea, OnOpenStorageArea) IPC_MESSAGE_HANDLER(DOMStorageHostMsg_CloseStorageArea, OnCloseStorageArea) IPC_MESSAGE_HANDLER(DOMStorageHostMsg_LoadStorageArea, OnLoadStorageArea) diff --git a/content/browser/dom_storage/dom_storage_message_filter.h b/content/browser/dom_storage/dom_storage_message_filter.h index 3c82418..dc63c1c 100644 --- a/content/browser/dom_storage/dom_storage_message_filter.h +++ b/content/browser/dom_storage/dom_storage_message_filter.h @@ -44,8 +44,7 @@ class DOMStorageMessageFilter virtual void OnFilterRemoved() OVERRIDE; virtual base::TaskRunner* OverrideTaskRunnerForMessage( const IPC::Message& message) OVERRIDE; - virtual bool OnMessageReceived(const IPC::Message& message, - bool* message_was_ok) OVERRIDE; + virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; // Message Handlers. void OnOpenStorageArea(int connection_id, int64 namespace_id, diff --git a/content/browser/fileapi/fileapi_message_filter.cc b/content/browser/fileapi/fileapi_message_filter.cc index b0dce9f..2eb601a 100644 --- a/content/browser/fileapi/fileapi_message_filter.cc +++ b/content/browser/fileapi/fileapi_message_filter.cc @@ -144,11 +144,9 @@ base::TaskRunner* FileAPIMessageFilter::OverrideTaskRunnerForMessage( return NULL; } -bool FileAPIMessageFilter::OnMessageReceived( - const IPC::Message& message, bool* message_was_ok) { - *message_was_ok = true; +bool FileAPIMessageFilter::OnMessageReceived(const IPC::Message& message) { bool handled = true; - IPC_BEGIN_MESSAGE_MAP_EX(FileAPIMessageFilter, message, *message_was_ok) + IPC_BEGIN_MESSAGE_MAP(FileAPIMessageFilter, message) IPC_MESSAGE_HANDLER(FileSystemHostMsg_OpenFileSystem, OnOpenFileSystem) IPC_MESSAGE_HANDLER(FileSystemHostMsg_ResolveURL, OnResolveURL) IPC_MESSAGE_HANDLER(FileSystemHostMsg_DeleteFileSystem, OnDeleteFileSystem) @@ -192,7 +190,7 @@ bool FileAPIMessageFilter::OnMessageReceived( IPC_MESSAGE_HANDLER(StreamHostMsg_Clone, OnCloneStream) IPC_MESSAGE_HANDLER(StreamHostMsg_Remove, OnRemoveStream) IPC_MESSAGE_UNHANDLED(handled = false) - IPC_END_MESSAGE_MAP_EX() + IPC_END_MESSAGE_MAP() return handled; } diff --git a/content/browser/fileapi/fileapi_message_filter.h b/content/browser/fileapi/fileapi_message_filter.h index e47e1b0c..7a98b1483 100644 --- a/content/browser/fileapi/fileapi_message_filter.h +++ b/content/browser/fileapi/fileapi_message_filter.h @@ -79,8 +79,7 @@ class CONTENT_EXPORT FileAPIMessageFilter : public BrowserMessageFilter { virtual void OnChannelClosing() OVERRIDE; virtual base::TaskRunner* OverrideTaskRunnerForMessage( const IPC::Message& message) OVERRIDE; - virtual bool OnMessageReceived(const IPC::Message& message, - bool* message_was_ok) OVERRIDE; + virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; protected: virtual ~FileAPIMessageFilter(); diff --git a/content/browser/fileapi/fileapi_message_filter_unittest.cc b/content/browser/fileapi/fileapi_message_filter_unittest.cc index a572386..3a4c47e9 100644 --- a/content/browser/fileapi/fileapi_message_filter_unittest.cc +++ b/content/browser/fileapi/fileapi_message_filter_unittest.cc @@ -75,13 +75,6 @@ class FileAPIMessageFilterTest : public testing::Test { message_loop_.RunUntilIdle(); } - // Tests via OnMessageReceived(const IPC::Message&). The channel proxy calls - // this method. - bool InvokeOnMessageReceived(const IPC::Message& message) { - bool message_was_ok; - return filter_->OnMessageReceived(message, &message_was_ok); - } - base::MessageLoop message_loop_; TestBrowserThread io_browser_thread_; @@ -109,8 +102,7 @@ TEST_F(FileAPIMessageFilterTest, CloseChannelWithInflightRequest) { int request_id = 0; const GURL kUrl("filesystem:http://example.com/temporary/foo"); FileSystemHostMsg_ReadMetadata read_metadata(request_id++, kUrl); - bool message_was_ok; - EXPECT_TRUE(filter->OnMessageReceived(read_metadata, &message_was_ok)); + EXPECT_TRUE(filter->OnMessageReceived(read_metadata)); // Close the filter while it has inflight request. filter->OnChannelClosing(); @@ -143,8 +135,7 @@ TEST_F(FileAPIMessageFilterTest, MultipleFilters) { int request_id = 0; const GURL kUrl("filesystem:http://example.com/temporary/foo"); FileSystemHostMsg_ReadMetadata read_metadata(request_id++, kUrl); - bool message_was_ok; - EXPECT_TRUE(filter1->OnMessageReceived(read_metadata, &message_was_ok)); + EXPECT_TRUE(filter1->OnMessageReceived(read_metadata)); // Close the other filter before the request for filter1 is processed. filter2->OnChannelClosing(); @@ -162,7 +153,7 @@ TEST_F(FileAPIMessageFilterTest, BuildEmptyStream) { EXPECT_EQ(NULL, stream_registry->GetStream(kUrl).get()); StreamHostMsg_StartBuilding start_message(kUrl, kFakeContentType); - EXPECT_TRUE(InvokeOnMessageReceived(start_message)); + EXPECT_TRUE(filter_->OnMessageReceived(start_message)); const int kBufferSize = 10; scoped_refptr<net::IOBuffer> buffer(new net::IOBuffer(kBufferSize)); @@ -177,7 +168,7 @@ TEST_F(FileAPIMessageFilterTest, BuildEmptyStream) { stream = NULL; StreamHostMsg_FinishBuilding finish_message(kUrl); - EXPECT_TRUE(InvokeOnMessageReceived(finish_message)); + EXPECT_TRUE(filter_->OnMessageReceived(finish_message)); stream = stream_registry->GetStream(kUrl); ASSERT_FALSE(stream.get() == NULL); @@ -204,16 +195,16 @@ TEST_F(FileAPIMessageFilterTest, BuildNonEmptyStream) { EXPECT_EQ(NULL, stream_registry->GetStream(kUrl).get()); StreamHostMsg_StartBuilding start_message(kUrl, kFakeContentType); - EXPECT_TRUE(InvokeOnMessageReceived(start_message)); + EXPECT_TRUE(filter_->OnMessageReceived(start_message)); webkit_blob::BlobData::Item item; const std::string kFakeData = "foobarbaz"; item.SetToBytes(kFakeData.data(), kFakeData.size()); StreamHostMsg_AppendBlobDataItem append_message(kUrl, item); - EXPECT_TRUE(InvokeOnMessageReceived(append_message)); + EXPECT_TRUE(filter_->OnMessageReceived(append_message)); StreamHostMsg_FinishBuilding finish_message(kUrl); - EXPECT_TRUE(InvokeOnMessageReceived(finish_message)); + EXPECT_TRUE(filter_->OnMessageReceived(finish_message)); // Run loop to finish transfer and commit finalize command. message_loop_.RunUntilIdle(); @@ -248,7 +239,7 @@ TEST_F(FileAPIMessageFilterTest, BuildStreamWithSharedMemory) { filter_->set_peer_pid_for_testing(base::Process::Current().pid()); StreamHostMsg_StartBuilding start_message(kUrl, kFakeContentType); - EXPECT_TRUE(InvokeOnMessageReceived(start_message)); + EXPECT_TRUE(filter_->OnMessageReceived(start_message)); const std::string kFakeData = "foobarbaz"; @@ -257,10 +248,10 @@ TEST_F(FileAPIMessageFilterTest, BuildStreamWithSharedMemory) { memcpy(shared_memory->memory(), kFakeData.data(), kFakeData.size()); StreamHostMsg_SyncAppendSharedMemory append_message( kUrl, shared_memory->handle(), kFakeData.size()); - EXPECT_TRUE(InvokeOnMessageReceived(append_message)); + EXPECT_TRUE(filter_->OnMessageReceived(append_message)); StreamHostMsg_FinishBuilding finish_message(kUrl); - EXPECT_TRUE(InvokeOnMessageReceived(finish_message)); + EXPECT_TRUE(filter_->OnMessageReceived(finish_message)); // Run loop to finish transfer and commit finalize command. message_loop_.RunUntilIdle(); @@ -287,7 +278,7 @@ TEST_F(FileAPIMessageFilterTest, BuildStreamAndCallOnChannelClosing) { const GURL kUrl(kFakeBlobInternalUrlSpec); StreamHostMsg_StartBuilding start_message(kUrl, kFakeContentType); - EXPECT_TRUE(InvokeOnMessageReceived(start_message)); + EXPECT_TRUE(filter_->OnMessageReceived(start_message)); ASSERT_FALSE(stream_registry->GetStream(kUrl).get() == NULL); @@ -303,10 +294,10 @@ TEST_F(FileAPIMessageFilterTest, CloneStream) { const GURL kDestUrl(kFakeBlobInternalUrlSpec2); StreamHostMsg_StartBuilding start_message(kUrl, kFakeContentType); - EXPECT_TRUE(InvokeOnMessageReceived(start_message)); + EXPECT_TRUE(filter_->OnMessageReceived(start_message)); StreamHostMsg_Clone clone_message(kDestUrl, kUrl); - EXPECT_TRUE(InvokeOnMessageReceived(clone_message)); + EXPECT_TRUE(filter_->OnMessageReceived(clone_message)); ASSERT_FALSE(stream_registry->GetStream(kUrl).get() == NULL); ASSERT_FALSE(stream_registry->GetStream(kDestUrl).get() == NULL); diff --git a/content/browser/frame_host/cross_process_frame_connector.cc b/content/browser/frame_host/cross_process_frame_connector.cc index 19fcdf0..0e40332 100644 --- a/content/browser/frame_host/cross_process_frame_connector.cc +++ b/content/browser/frame_host/cross_process_frame_connector.cc @@ -29,9 +29,8 @@ CrossProcessFrameConnector::~CrossProcessFrameConnector() { bool CrossProcessFrameConnector::OnMessageReceived(const IPC::Message& msg) { bool handled = true; - bool msg_is_ok = true; - IPC_BEGIN_MESSAGE_MAP_EX(CrossProcessFrameConnector, msg, msg_is_ok) + IPC_BEGIN_MESSAGE_MAP(CrossProcessFrameConnector, msg) IPC_MESSAGE_HANDLER(FrameHostMsg_BuffersSwappedACK, OnBuffersSwappedACK) IPC_MESSAGE_HANDLER(FrameHostMsg_CompositorFrameSwappedACK, OnCompositorFrameSwappedACK) @@ -41,7 +40,7 @@ bool CrossProcessFrameConnector::OnMessageReceived(const IPC::Message& msg) { IPC_MESSAGE_HANDLER(FrameHostMsg_InitializeChildFrame, OnInitializeChildFrame) IPC_MESSAGE_UNHANDLED(handled = false) - IPC_END_MESSAGE_MAP_EX() + IPC_END_MESSAGE_MAP() return handled; } diff --git a/content/browser/frame_host/interstitial_page_impl.cc b/content/browser/frame_host/interstitial_page_impl.cc index 8420209..240ad78 100644 --- a/content/browser/frame_host/interstitial_page_impl.cc +++ b/content/browser/frame_host/interstitial_page_impl.cc @@ -379,17 +379,11 @@ bool InterstitialPageImpl::OnMessageReceived(RenderViewHost* render_view_host, bool InterstitialPageImpl::OnMessageReceived(const IPC::Message& message) { bool handled = true; - bool message_is_ok = true; - IPC_BEGIN_MESSAGE_MAP_EX(InterstitialPageImpl, message, message_is_ok) + IPC_BEGIN_MESSAGE_MAP(InterstitialPageImpl, message) IPC_MESSAGE_HANDLER(FrameHostMsg_DomOperationResponse, OnDomOperationResponse) IPC_MESSAGE_UNHANDLED(handled = false) - IPC_END_MESSAGE_MAP_EX() - - if (!message_is_ok) { - RecordAction(base::UserMetricsAction("BadMessageTerminate_RVD")); - web_contents()->GetRenderProcessHost()->ReceivedBadMessage(); - } + IPC_END_MESSAGE_MAP() return handled; } diff --git a/content/browser/frame_host/render_frame_host_impl.cc b/content/browser/frame_host/render_frame_host_impl.cc index a5ff5cd..08d7c0f 100644 --- a/content/browser/frame_host/render_frame_host_impl.cc +++ b/content/browser/frame_host/render_frame_host_impl.cc @@ -276,8 +276,7 @@ bool RenderFrameHostImpl::OnMessageReceived(const IPC::Message &msg) { return true; bool handled = true; - bool msg_is_ok = true; - IPC_BEGIN_MESSAGE_MAP_EX(RenderFrameHostImpl, msg, msg_is_ok) + IPC_BEGIN_MESSAGE_MAP(RenderFrameHostImpl, msg) IPC_MESSAGE_HANDLER(FrameHostMsg_AddMessageToConsole, OnAddMessageToConsole) IPC_MESSAGE_HANDLER(FrameHostMsg_Detach, OnDetach) IPC_MESSAGE_HANDLER(FrameHostMsg_FrameFocused, OnFrameFocused) @@ -316,14 +315,7 @@ bool RenderFrameHostImpl::OnMessageReceived(const IPC::Message &msg) { OnShowDesktopNotification) IPC_MESSAGE_HANDLER(DesktopNotificationHostMsg_Cancel, OnCancelDesktopNotification) - IPC_END_MESSAGE_MAP_EX() - - if (!msg_is_ok) { - // The message had a handler, but its de-serialization failed. - // Kill the renderer. - RecordAction(base::UserMetricsAction("BadMessageTerminate_RFH")); - GetProcess()->ReceivedBadMessage(); - } + IPC_END_MESSAGE_MAP() return handled; } diff --git a/content/browser/frame_host/render_frame_message_filter.cc b/content/browser/frame_host/render_frame_message_filter.cc index b7d00e6..8e41430 100644 --- a/content/browser/frame_host/render_frame_message_filter.cc +++ b/content/browser/frame_host/render_frame_message_filter.cc @@ -39,13 +39,12 @@ RenderFrameMessageFilter::RenderFrameMessageFilter( RenderFrameMessageFilter::~RenderFrameMessageFilter() { } -bool RenderFrameMessageFilter::OnMessageReceived(const IPC::Message& message, - bool* message_was_ok) { +bool RenderFrameMessageFilter::OnMessageReceived(const IPC::Message& message) { bool handled = true; - IPC_BEGIN_MESSAGE_MAP_EX(RenderFrameMessageFilter, message, *message_was_ok) + IPC_BEGIN_MESSAGE_MAP(RenderFrameMessageFilter, message) IPC_MESSAGE_HANDLER(FrameHostMsg_CreateChildFrame, OnCreateChildFrame) IPC_MESSAGE_UNHANDLED(handled = false) - IPC_END_MESSAGE_MAP_EX() + IPC_END_MESSAGE_MAP() return handled; } diff --git a/content/browser/frame_host/render_frame_message_filter.h b/content/browser/frame_host/render_frame_message_filter.h index 26bcaca..25f7fbd 100644 --- a/content/browser/frame_host/render_frame_message_filter.h +++ b/content/browser/frame_host/render_frame_message_filter.h @@ -21,8 +21,7 @@ class RenderFrameMessageFilter : public BrowserMessageFilter { RenderFrameMessageFilter(int render_process_id, RenderWidgetHelper* render_widget_helper); - virtual bool OnMessageReceived(const IPC::Message& message, - bool* message_was_ok) OVERRIDE; + virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; private: virtual ~RenderFrameMessageFilter(); diff --git a/content/browser/histogram_message_filter.cc b/content/browser/histogram_message_filter.cc index eae1100..8a58fff 100644 --- a/content/browser/histogram_message_filter.cc +++ b/content/browser/histogram_message_filter.cc @@ -17,16 +17,15 @@ namespace content { HistogramMessageFilter::HistogramMessageFilter() : BrowserMessageFilter(ChildProcessMsgStart) {} -bool HistogramMessageFilter::OnMessageReceived(const IPC::Message& message, - bool* message_was_ok) { +bool HistogramMessageFilter::OnMessageReceived(const IPC::Message& message) { bool handled = true; - IPC_BEGIN_MESSAGE_MAP_EX(HistogramMessageFilter, message, *message_was_ok) + IPC_BEGIN_MESSAGE_MAP(HistogramMessageFilter, message) IPC_MESSAGE_HANDLER(ChildProcessHostMsg_ChildHistogramData, OnChildHistogramData) IPC_MESSAGE_HANDLER(ChildProcessHostMsg_GetBrowserHistogram, OnGetBrowserHistogram) IPC_MESSAGE_UNHANDLED(handled = false) - IPC_END_MESSAGE_MAP_EX() + IPC_END_MESSAGE_MAP() return handled; } diff --git a/content/browser/histogram_message_filter.h b/content/browser/histogram_message_filter.h index 64c13cb..6786706 100644 --- a/content/browser/histogram_message_filter.h +++ b/content/browser/histogram_message_filter.h @@ -19,8 +19,7 @@ class HistogramMessageFilter : public BrowserMessageFilter { HistogramMessageFilter(); // BrowserMessageFilter implementation. - virtual bool OnMessageReceived(const IPC::Message& message, - bool* message_was_ok) OVERRIDE; + virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; private: virtual ~HistogramMessageFilter(); diff --git a/content/browser/indexed_db/indexed_db_dispatcher_host.cc b/content/browser/indexed_db/indexed_db_dispatcher_host.cc index 4f49b0e..5ec2b94 100644 --- a/content/browser/indexed_db/indexed_db_dispatcher_host.cc +++ b/content/browser/indexed_db/indexed_db_dispatcher_host.cc @@ -124,21 +124,19 @@ base::TaskRunner* IndexedDBDispatcherHost::OverrideTaskRunnerForMessage( return NULL; } -bool IndexedDBDispatcherHost::OnMessageReceived(const IPC::Message& message, - bool* message_was_ok) { +bool IndexedDBDispatcherHost::OnMessageReceived(const IPC::Message& message) { if (IPC_MESSAGE_CLASS(message) != IndexedDBMsgStart) return false; DCHECK(indexed_db_context_->TaskRunner()->RunsTasksOnCurrentThread() || message.type() == IndexedDBHostMsg_DatabasePut::ID); - bool handled = - database_dispatcher_host_->OnMessageReceived(message, message_was_ok) || - cursor_dispatcher_host_->OnMessageReceived(message, message_was_ok); + bool handled = database_dispatcher_host_->OnMessageReceived(message) || + cursor_dispatcher_host_->OnMessageReceived(message); if (!handled) { handled = true; - IPC_BEGIN_MESSAGE_MAP_EX(IndexedDBDispatcherHost, message, *message_was_ok) + IPC_BEGIN_MESSAGE_MAP(IndexedDBDispatcherHost, message) IPC_MESSAGE_HANDLER(IndexedDBHostMsg_FactoryGetDatabaseNames, OnIDBFactoryGetDatabaseNames) IPC_MESSAGE_HANDLER(IndexedDBHostMsg_FactoryOpen, OnIDBFactoryOpen) @@ -462,16 +460,15 @@ void IndexedDBDispatcherHost::DatabaseDispatcherHost::CloseAll() { } bool IndexedDBDispatcherHost::DatabaseDispatcherHost::OnMessageReceived( - const IPC::Message& message, - bool* msg_is_ok) { + const IPC::Message& message) { DCHECK( (message.type() == IndexedDBHostMsg_DatabasePut::ID) || parent_->indexed_db_context_->TaskRunner()->RunsTasksOnCurrentThread()); bool handled = true; - IPC_BEGIN_MESSAGE_MAP_EX( - IndexedDBDispatcherHost::DatabaseDispatcherHost, message, *msg_is_ok) + IPC_BEGIN_MESSAGE_MAP( + IndexedDBDispatcherHost::DatabaseDispatcherHost, message) IPC_MESSAGE_HANDLER(IndexedDBHostMsg_DatabaseCreateObjectStore, OnCreateObjectStore) IPC_MESSAGE_HANDLER(IndexedDBHostMsg_DatabaseDeleteObjectStore, @@ -882,11 +879,10 @@ IndexedDBDispatcherHost::CursorDispatcherHost::CursorDispatcherHost( IndexedDBDispatcherHost::CursorDispatcherHost::~CursorDispatcherHost() {} bool IndexedDBDispatcherHost::CursorDispatcherHost::OnMessageReceived( - const IPC::Message& message, - bool* msg_is_ok) { + const IPC::Message& message) { bool handled = true; - IPC_BEGIN_MESSAGE_MAP_EX( - IndexedDBDispatcherHost::CursorDispatcherHost, message, *msg_is_ok) + IPC_BEGIN_MESSAGE_MAP( + IndexedDBDispatcherHost::CursorDispatcherHost, message) IPC_MESSAGE_HANDLER(IndexedDBHostMsg_CursorAdvance, OnAdvance) IPC_MESSAGE_HANDLER(IndexedDBHostMsg_CursorContinue, OnContinue) IPC_MESSAGE_HANDLER(IndexedDBHostMsg_CursorPrefetch, OnPrefetch) diff --git a/content/browser/indexed_db/indexed_db_dispatcher_host.h b/content/browser/indexed_db/indexed_db_dispatcher_host.h index 7ce6cff..a69a584 100644 --- a/content/browser/indexed_db/indexed_db_dispatcher_host.h +++ b/content/browser/indexed_db/indexed_db_dispatcher_host.h @@ -62,8 +62,7 @@ class IndexedDBDispatcherHost : public BrowserMessageFilter { virtual void OnDestruct() const OVERRIDE; virtual base::TaskRunner* OverrideTaskRunnerForMessage( const IPC::Message& message) OVERRIDE; - virtual bool OnMessageReceived(const IPC::Message& message, - bool* message_was_ok) OVERRIDE; + virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; void FinishTransaction(int64 host_transaction_id, bool committed); @@ -176,7 +175,7 @@ class IndexedDBDispatcherHost : public BrowserMessageFilter { ~DatabaseDispatcherHost(); void CloseAll(); - bool OnMessageReceived(const IPC::Message& message, bool* msg_is_ok); + bool OnMessageReceived(const IPC::Message& message); void OnCreateObjectStore( const IndexedDBHostMsg_DatabaseCreateObjectStore_Params& params); @@ -231,7 +230,7 @@ class IndexedDBDispatcherHost : public BrowserMessageFilter { explicit CursorDispatcherHost(IndexedDBDispatcherHost* parent); ~CursorDispatcherHost(); - bool OnMessageReceived(const IPC::Message& message, bool* msg_is_ok); + bool OnMessageReceived(const IPC::Message& message); void OnAdvance(int32 ipc_object_store_id, int32 ipc_thread_id, diff --git a/content/browser/loader/async_resource_handler.cc b/content/browser/loader/async_resource_handler.cc index 886c49a..fbd8f14 100644 --- a/content/browser/loader/async_resource_handler.cc +++ b/content/browser/loader/async_resource_handler.cc @@ -97,14 +97,13 @@ AsyncResourceHandler::~AsyncResourceHandler() { rdh_->FinishedWithResourcesForRequest(request()); } -bool AsyncResourceHandler::OnMessageReceived(const IPC::Message& message, - bool* message_was_ok) { +bool AsyncResourceHandler::OnMessageReceived(const IPC::Message& message) { bool handled = true; - IPC_BEGIN_MESSAGE_MAP_EX(AsyncResourceHandler, message, *message_was_ok) + IPC_BEGIN_MESSAGE_MAP(AsyncResourceHandler, message) IPC_MESSAGE_HANDLER(ResourceHostMsg_FollowRedirect, OnFollowRedirect) IPC_MESSAGE_HANDLER(ResourceHostMsg_DataReceived_ACK, OnDataReceivedACK) IPC_MESSAGE_UNHANDLED(handled = false) - IPC_END_MESSAGE_MAP_EX() + IPC_END_MESSAGE_MAP() return handled; } diff --git a/content/browser/loader/async_resource_handler.h b/content/browser/loader/async_resource_handler.h index 3c0fce7..4d6aa50 100644 --- a/content/browser/loader/async_resource_handler.h +++ b/content/browser/loader/async_resource_handler.h @@ -32,8 +32,7 @@ class AsyncResourceHandler : public ResourceHandler, ResourceDispatcherHostImpl* rdh); virtual ~AsyncResourceHandler(); - virtual bool OnMessageReceived(const IPC::Message& message, - bool* message_was_ok) OVERRIDE; + virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; // ResourceHandler implementation: virtual bool OnUploadProgress(int request_id, diff --git a/content/browser/loader/resource_dispatcher_host_impl.cc b/content/browser/loader/resource_dispatcher_host_impl.cc index 917d0e1..08bf577 100644 --- a/content/browser/loader/resource_dispatcher_host_impl.cc +++ b/content/browser/loader/resource_dispatcher_host_impl.cc @@ -819,11 +819,10 @@ void ResourceDispatcherHostImpl::OnShutdown() { bool ResourceDispatcherHostImpl::OnMessageReceived( const IPC::Message& message, - ResourceMessageFilter* filter, - bool* message_was_ok) { + ResourceMessageFilter* filter) { filter_ = filter; bool handled = true; - IPC_BEGIN_MESSAGE_MAP_EX(ResourceDispatcherHostImpl, message, *message_was_ok) + IPC_BEGIN_MESSAGE_MAP(ResourceDispatcherHostImpl, message) IPC_MESSAGE_HANDLER(ResourceHostMsg_RequestResource, OnRequestResource) IPC_MESSAGE_HANDLER_DELAY_REPLY(ResourceHostMsg_SyncLoad, OnSyncLoad) IPC_MESSAGE_HANDLER(ResourceHostMsg_ReleaseDownloadedFile, @@ -832,7 +831,7 @@ bool ResourceDispatcherHostImpl::OnMessageReceived( IPC_MESSAGE_HANDLER(ResourceHostMsg_UploadProgress_ACK, OnUploadProgressACK) IPC_MESSAGE_HANDLER(ResourceHostMsg_CancelRequest, OnCancelRequest) IPC_MESSAGE_UNHANDLED(handled = false) - IPC_END_MESSAGE_MAP_EX() + IPC_END_MESSAGE_MAP() if (!handled && IPC_MESSAGE_ID_CLASS(message.type()) == ResourceMsgStart) { PickleIterator iter(message); @@ -845,7 +844,7 @@ bool ResourceDispatcherHostImpl::OnMessageReceived( ObserverList<ResourceMessageDelegate>::Iterator del_it(*it->second); ResourceMessageDelegate* delegate; while (!handled && (delegate = del_it.GetNext()) != NULL) { - handled = delegate->OnMessageReceived(message, message_was_ok); + handled = delegate->OnMessageReceived(message); } } diff --git a/content/browser/loader/resource_dispatcher_host_impl.h b/content/browser/loader/resource_dispatcher_host_impl.h index 8f839c8..185fb0b 100644 --- a/content/browser/loader/resource_dispatcher_host_impl.h +++ b/content/browser/loader/resource_dispatcher_host_impl.h @@ -109,10 +109,8 @@ class CONTENT_EXPORT ResourceDispatcherHostImpl void CancelRequestsForContext(ResourceContext* context); // Returns true if the message was a resource message that was processed. - // If it was, message_was_ok will be false iff the message was corrupt. bool OnMessageReceived(const IPC::Message& message, - ResourceMessageFilter* filter, - bool* message_was_ok); + ResourceMessageFilter* filter); // Initiates a save file from the browser process (as opposed to a resource // request from the renderer or another child process). diff --git a/content/browser/loader/resource_dispatcher_host_unittest.cc b/content/browser/loader/resource_dispatcher_host_unittest.cc index 815dda8..68869c15 100644 --- a/content/browser/loader/resource_dispatcher_host_unittest.cc +++ b/content/browser/loader/resource_dispatcher_host_unittest.cc @@ -78,9 +78,8 @@ void GetResponseHead(const std::vector<IPC::Message>& messages, void GenerateIPCMessage( scoped_refptr<ResourceMessageFilter> filter, scoped_ptr<IPC::Message> message) { - bool msg_is_ok; ResourceDispatcherHostImpl::Get()->OnMessageReceived( - *message, filter.get(), &msg_is_ok); + *message, filter.get()); } // On Windows, ResourceMsg_SetDataBuffer supplies a HANDLE which is not @@ -927,8 +926,7 @@ void ResourceDispatcherHostTest::MakeTestRequestWithResourceType( ResourceHostMsg_Request request = CreateResourceRequest("GET", type, url); ResourceHostMsg_RequestResource msg(render_view_id, request_id, request); - bool msg_was_ok; - host_.OnMessageReceived(msg, filter, &msg_was_ok); + host_.OnMessageReceived(msg, filter); KickOffRequest(); } @@ -1068,8 +1066,7 @@ TEST_F(ResourceDispatcherHostTest, TestMany) { // Finish the redirection ResourceHostMsg_FollowRedirect redirect_msg(5); - bool msg_was_ok; - host_.OnMessageReceived(redirect_msg, filter_.get(), &msg_was_ok); + host_.OnMessageReceived(redirect_msg, filter_.get()); base::MessageLoop::current()->RunUntilIdle(); // flush all the pending requests @@ -1195,11 +1192,10 @@ TEST_F(ResourceDispatcherHostTest, DeletedFilterDetached) { ResourceHostMsg_Request request_ping = CreateResourceRequest( "GET", ResourceType::PING, net::URLRequestTestJob::test_url_3()); - bool msg_was_ok; ResourceHostMsg_RequestResource msg_prefetch(0, 1, request_prefetch); - host_.OnMessageReceived(msg_prefetch, filter_, &msg_was_ok); + host_.OnMessageReceived(msg_prefetch, filter_); ResourceHostMsg_RequestResource msg_ping(0, 2, request_ping); - host_.OnMessageReceived(msg_ping, filter_, &msg_was_ok); + host_.OnMessageReceived(msg_ping, filter_); // Remove the filter before processing the requests by simulating channel // closure. @@ -1247,8 +1243,7 @@ TEST_F(ResourceDispatcherHostTest, DeletedFilterDetachedRedirect) { net::URLRequestTestJob::test_url_redirect_to_url_2()); ResourceHostMsg_RequestResource msg(0, 1, request); - bool msg_was_ok; - host_.OnMessageReceived(msg, filter_, &msg_was_ok); + host_.OnMessageReceived(msg, filter_); // Remove the filter before processing the request by simulating channel // closure. @@ -2123,8 +2118,7 @@ TEST_F(ResourceDispatcherHostTest, IgnoreCancelForDownloads) { // And now simulate a cancellation coming from the renderer. ResourceHostMsg_CancelRequest msg(request_id); - bool msg_was_ok; - host_.OnMessageReceived(msg, filter_.get(), &msg_was_ok); + host_.OnMessageReceived(msg, filter_.get()); // Since the request had already started processing as a download, // the cancellation above should have been ignored and the request @@ -2159,8 +2153,7 @@ TEST_F(ResourceDispatcherHostTest, CancelRequestsForContext) { // And now simulate a cancellation coming from the renderer. ResourceHostMsg_CancelRequest msg(request_id); - bool msg_was_ok; - host_.OnMessageReceived(msg, filter_.get(), &msg_was_ok); + host_.OnMessageReceived(msg, filter_.get()); // Since the request had already started processing as a download, // the cancellation above should have been ignored and the request @@ -2228,8 +2221,7 @@ TEST_F(ResourceDispatcherHostTest, CancelRequestsForContextTransferred) { // And now simulate a cancellation coming from the renderer. ResourceHostMsg_CancelRequest msg(request_id); - bool msg_was_ok; - host_.OnMessageReceived(msg, filter_.get(), &msg_was_ok); + host_.OnMessageReceived(msg, filter_.get()); // Since the request is marked as being transferred, // the cancellation above should have been ignored and the request @@ -2279,8 +2271,7 @@ TEST_F(ResourceDispatcherHostTest, TransferNavigationHtml) { "Content-Type: text/html\n\n", kResponseBody); ResourceHostMsg_FollowRedirect redirect_msg(request_id); - bool msg_was_ok; - host_.OnMessageReceived(redirect_msg, filter_.get(), &msg_was_ok); + host_.OnMessageReceived(redirect_msg, filter_.get()); base::MessageLoop::current()->RunUntilIdle(); // Flush all the pending requests to get the response through the @@ -2304,8 +2295,7 @@ TEST_F(ResourceDispatcherHostTest, TransferNavigationHtml) { ResourceHostMsg_RequestResource transfer_request_msg( new_render_view_id, new_request_id, request); - host_.OnMessageReceived( - transfer_request_msg, second_filter.get(), &msg_was_ok); + host_.OnMessageReceived(transfer_request_msg, second_filter.get()); base::MessageLoop::current()->RunUntilIdle(); // Check generated messages. @@ -2354,8 +2344,7 @@ TEST_F(ResourceDispatcherHostTest, TransferNavigationText) { "Content-Type: text/plain\n\n", kResponseBody); ResourceHostMsg_FollowRedirect redirect_msg(request_id); - bool msg_was_ok; - host_.OnMessageReceived(redirect_msg, filter_.get(), &msg_was_ok); + host_.OnMessageReceived(redirect_msg, filter_.get()); base::MessageLoop::current()->RunUntilIdle(); // Flush all the pending requests to get the response through the @@ -2379,8 +2368,7 @@ TEST_F(ResourceDispatcherHostTest, TransferNavigationText) { ResourceHostMsg_RequestResource transfer_request_msg( new_render_view_id, new_request_id, request); - host_.OnMessageReceived( - transfer_request_msg, second_filter.get(), &msg_was_ok); + host_.OnMessageReceived(transfer_request_msg, second_filter.get()); base::MessageLoop::current()->RunUntilIdle(); // Check generated messages. @@ -2426,9 +2414,7 @@ TEST_F(ResourceDispatcherHostTest, TransferNavigationWithProcessCrash) { ResourceHostMsg_RequestResource first_request_msg( render_view_id, request_id, first_request); - bool msg_was_ok; - host_.OnMessageReceived( - first_request_msg, first_filter.get(), &msg_was_ok); + host_.OnMessageReceived(first_request_msg, first_filter.get()); base::MessageLoop::current()->RunUntilIdle(); // Now that we're blocked on the redirect, update the response and unblock @@ -2437,7 +2423,7 @@ TEST_F(ResourceDispatcherHostTest, TransferNavigationWithProcessCrash) { "Content-Type: text/html\n\n", kResponseBody); ResourceHostMsg_FollowRedirect redirect_msg(request_id); - host_.OnMessageReceived(redirect_msg, first_filter.get(), &msg_was_ok); + host_.OnMessageReceived(redirect_msg, first_filter.get()); base::MessageLoop::current()->RunUntilIdle(); // Flush all the pending requests to get the response through the @@ -2468,9 +2454,7 @@ TEST_F(ResourceDispatcherHostTest, TransferNavigationWithProcessCrash) { child_ids_.insert(second_filter->child_id()); ResourceHostMsg_RequestResource transfer_request_msg( new_render_view_id, new_request_id, request); - bool msg_was_ok; - host_.OnMessageReceived( - transfer_request_msg, second_filter.get(), &msg_was_ok); + host_.OnMessageReceived(transfer_request_msg, second_filter.get()); base::MessageLoop::current()->RunUntilIdle(); // Check generated messages. @@ -2511,8 +2495,7 @@ TEST_F(ResourceDispatcherHostTest, TransferNavigationWithTwoRedirects) { SetResponse("HTTP/1.1 302 Found\n" "Location: http://other.com/blerg\n\n"); ResourceHostMsg_FollowRedirect redirect_msg(request_id); - bool msg_was_ok; - host_.OnMessageReceived(redirect_msg, filter_.get(), &msg_was_ok); + host_.OnMessageReceived(redirect_msg, filter_.get()); base::MessageLoop::current()->RunUntilIdle(); // Now that we're blocked on the second redirect, update the response and @@ -2524,7 +2507,7 @@ TEST_F(ResourceDispatcherHostTest, TransferNavigationWithTwoRedirects) { "Content-Type: text/plain\n\n", kResponseBody); ResourceHostMsg_FollowRedirect redirect_msg2(request_id); - host_.OnMessageReceived(redirect_msg2, filter_.get(), &msg_was_ok); + host_.OnMessageReceived(redirect_msg2, filter_.get()); base::MessageLoop::current()->RunUntilIdle(); // Flush all the pending requests to get the response through the @@ -2550,8 +2533,7 @@ TEST_F(ResourceDispatcherHostTest, TransferNavigationWithTwoRedirects) { child_ids_.insert(second_filter->child_id()); ResourceHostMsg_RequestResource transfer_request_msg( new_render_view_id, new_request_id, request); - host_.OnMessageReceived( - transfer_request_msg, second_filter.get(), &msg_was_ok); + host_.OnMessageReceived(transfer_request_msg, second_filter.get()); // Verify that we update the ResourceRequestInfo. GlobalRequestID global_request_id(second_filter->child_id(), new_request_id); @@ -2649,8 +2631,7 @@ TEST_F(ResourceDispatcherHostTest, DataSentBeforeDetach) { // Simulate a cancellation coming from the renderer. ResourceHostMsg_CancelRequest msg(request_id); - bool msg_was_ok; - host_.OnMessageReceived(msg, filter_.get(), &msg_was_ok); + host_.OnMessageReceived(msg, filter_.get()); EXPECT_EQ(1, host_.pending_requests()); @@ -2713,8 +2694,7 @@ TEST_F(ResourceDispatcherHostTest, DelayedDataReceivedACKs) { EXPECT_EQ(ResourceMsg_DataReceived::ID, msgs[0][i].type()); ResourceHostMsg_DataReceived_ACK msg(1); - bool msg_was_ok; - host_.OnMessageReceived(msg, filter_.get(), &msg_was_ok); + host_.OnMessageReceived(msg, filter_.get()); } base::MessageLoop::current()->RunUntilIdle(); @@ -2748,8 +2728,7 @@ TEST_F(ResourceDispatcherHostTest, DataReceivedUnexpectedACKs) { // Send some unexpected ACKs. for (size_t i = 0; i < 128; ++i) { ResourceHostMsg_DataReceived_ACK msg(1); - bool msg_was_ok; - host_.OnMessageReceived(msg, filter_.get(), &msg_was_ok); + host_.OnMessageReceived(msg, filter_.get()); } msgs[0].erase(msgs[0].begin()); @@ -2767,8 +2746,7 @@ TEST_F(ResourceDispatcherHostTest, DataReceivedUnexpectedACKs) { EXPECT_EQ(ResourceMsg_DataReceived::ID, msgs[0][i].type()); ResourceHostMsg_DataReceived_ACK msg(1); - bool msg_was_ok; - host_.OnMessageReceived(msg, filter_.get(), &msg_was_ok); + host_.OnMessageReceived(msg, filter_.get()); } base::MessageLoop::current()->RunUntilIdle(); @@ -2804,10 +2782,8 @@ TEST_F(ResourceDispatcherHostTest, RegisterDownloadedTempFile) { filter_->child_id(), file_path)); // The child releases from the request. - bool msg_was_ok = true; ResourceHostMsg_ReleaseDownloadedFile release_msg(kRequestID); - host_.OnMessageReceived(release_msg, filter_, &msg_was_ok); - ASSERT_TRUE(msg_was_ok); + host_.OnMessageReceived(release_msg, filter_); // Still readable because there is another reference to the file. (The child // may take additional blob references.) @@ -2865,9 +2841,7 @@ TEST_F(ResourceDispatcherHostTest, DownloadToFile) { "GET", ResourceType::SUB_RESOURCE, net::URLRequestTestJob::test_url_1()); request.download_to_file = true; ResourceHostMsg_RequestResource request_msg(0, 1, request); - bool msg_was_ok; - host_.OnMessageReceived(request_msg, filter_, &msg_was_ok); - ASSERT_TRUE(msg_was_ok); + host_.OnMessageReceived(request_msg, filter_); // Running the message loop until idle does not work because // RedirectToFileResourceHandler posts things to base::WorkerPool. Instead, @@ -2922,8 +2896,7 @@ TEST_F(ResourceDispatcherHostTest, DownloadToFile) { // RunUntilIdle doesn't work because base::WorkerPool is involved. ShareableFileReleaseWaiter waiter(response_head.download_file_path); ResourceHostMsg_ReleaseDownloadedFile release_msg(1); - host_.OnMessageReceived(release_msg, filter_, &msg_was_ok); - ASSERT_TRUE(msg_was_ok); + host_.OnMessageReceived(release_msg, filter_); waiter.Wait(); // The release callback runs before the delete is scheduled, so pump the // message loop for the delete itself. (This relies on the delete happening on diff --git a/content/browser/loader/resource_message_delegate.h b/content/browser/loader/resource_message_delegate.h index f447808..934d60c 100644 --- a/content/browser/loader/resource_message_delegate.h +++ b/content/browser/loader/resource_message_delegate.h @@ -29,8 +29,7 @@ class CONTENT_EXPORT ResourceMessageDelegate { // Called when the ResourceDispatcherHostImpl receives a message specifically // for this delegate. - virtual bool OnMessageReceived(const IPC::Message& message, - bool* message_was_ok) = 0; + virtual bool OnMessageReceived(const IPC::Message& message) = 0; void set_request_id(const GlobalRequestID& new_request_id) { id_ = new_request_id; diff --git a/content/browser/loader/resource_message_filter.cc b/content/browser/loader/resource_message_filter.cc index 91f13cb..137029c 100644 --- a/content/browser/loader/resource_message_filter.cc +++ b/content/browser/loader/resource_message_filter.cc @@ -42,10 +42,8 @@ void ResourceMessageFilter::OnChannelClosing() { ResourceDispatcherHostImpl::Get()->CancelRequestsForProcess(child_id_); } -bool ResourceMessageFilter::OnMessageReceived(const IPC::Message& message, - bool* message_was_ok) { - return ResourceDispatcherHostImpl::Get()->OnMessageReceived( - message, this, message_was_ok); +bool ResourceMessageFilter::OnMessageReceived(const IPC::Message& message) { + return ResourceDispatcherHostImpl::Get()->OnMessageReceived(message, this); } void ResourceMessageFilter::GetContexts( diff --git a/content/browser/loader/resource_message_filter.h b/content/browser/loader/resource_message_filter.h index 1783fc7..90af00e 100644 --- a/content/browser/loader/resource_message_filter.h +++ b/content/browser/loader/resource_message_filter.h @@ -53,8 +53,7 @@ class CONTENT_EXPORT ResourceMessageFilter : public BrowserMessageFilter { // BrowserMessageFilter implementation. virtual void OnChannelClosing() OVERRIDE; - virtual bool OnMessageReceived(const IPC::Message& message, - bool* message_was_ok) OVERRIDE; + virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; void GetContexts(const ResourceHostMsg_Request& request, ResourceContext** resource_context, diff --git a/content/browser/loader/resource_scheduler.cc b/content/browser/loader/resource_scheduler.cc index 9d59990..a826580 100644 --- a/content/browser/loader/resource_scheduler.cc +++ b/content/browser/loader/resource_scheduler.cc @@ -167,13 +167,12 @@ class ResourceScheduler::ScheduledResourceRequest private: // ResourceMessageDelegate interface: - virtual bool OnMessageReceived(const IPC::Message& message, - bool* message_was_ok) OVERRIDE { + virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE { bool handled = true; - IPC_BEGIN_MESSAGE_MAP_EX(ScheduledResourceRequest, message, *message_was_ok) + IPC_BEGIN_MESSAGE_MAP(ScheduledResourceRequest, message) IPC_MESSAGE_HANDLER(ResourceHostMsg_DidChangePriority, DidChangePriority) IPC_MESSAGE_UNHANDLED(handled = false) - IPC_END_MESSAGE_MAP_EX() + IPC_END_MESSAGE_MAP() return handled; } diff --git a/content/browser/loader/resource_scheduler_filter.cc b/content/browser/loader/resource_scheduler_filter.cc index 97e219e..4c825da 100644 --- a/content/browser/loader/resource_scheduler_filter.cc +++ b/content/browser/loader/resource_scheduler_filter.cc @@ -27,8 +27,7 @@ ResourceSchedulerFilter::ResourceSchedulerFilter(int child_id) ResourceSchedulerFilter::~ResourceSchedulerFilter() { } -bool ResourceSchedulerFilter::OnMessageReceived(const IPC::Message& message, - bool* message_was_ok) { +bool ResourceSchedulerFilter::OnMessageReceived(const IPC::Message& message) { ResourceScheduler* scheduler = ResourceDispatcherHostImpl::Get()->scheduler(); // scheduler can be NULL during shutdown, in which case it's ok to ignore the diff --git a/content/browser/loader/resource_scheduler_filter.h b/content/browser/loader/resource_scheduler_filter.h index 05a8631..9f4c5f3 100644 --- a/content/browser/loader/resource_scheduler_filter.h +++ b/content/browser/loader/resource_scheduler_filter.h @@ -19,8 +19,7 @@ class ResourceSchedulerFilter : public BrowserMessageFilter { explicit ResourceSchedulerFilter(int child_id); // BrowserMessageFilter methods: - virtual bool OnMessageReceived(const IPC::Message& message, - bool* message_was_ok) OVERRIDE; + virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; private: virtual ~ResourceSchedulerFilter(); diff --git a/content/browser/loader/resource_scheduler_unittest.cc b/content/browser/loader/resource_scheduler_unittest.cc index 7fba2a5..f4cb0e0f 100644 --- a/content/browser/loader/resource_scheduler_unittest.cc +++ b/content/browser/loader/resource_scheduler_unittest.cc @@ -198,9 +198,7 @@ class ResourceSchedulerTest : public testing::Test { const GlobalRequestID& id = info->GetGlobalRequestID(); ResourceHostMsg_DidChangePriority msg(id.request_id, new_priority, intra_priority); - bool ok = false; - rdh_.OnMessageReceived(msg, filter.get(), &ok); - EXPECT_TRUE(ok); + rdh_.OnMessageReceived(msg, filter.get()); } int next_request_id_; diff --git a/content/browser/media/android/browser_demuxer_android.cc b/content/browser/media/android/browser_demuxer_android.cc index 8715aff..1978952 100644 --- a/content/browser/media/android/browser_demuxer_android.cc +++ b/content/browser/media/android/browser_demuxer_android.cc @@ -70,10 +70,9 @@ void BrowserDemuxerAndroid::OverrideThreadForMessage( } } -bool BrowserDemuxerAndroid::OnMessageReceived(const IPC::Message& message, - bool* message_was_ok) { +bool BrowserDemuxerAndroid::OnMessageReceived(const IPC::Message& message) { bool handled = true; - IPC_BEGIN_MESSAGE_MAP_EX(BrowserDemuxerAndroid, message, *message_was_ok) + IPC_BEGIN_MESSAGE_MAP(BrowserDemuxerAndroid, message) IPC_MESSAGE_HANDLER(MediaPlayerHostMsg_DemuxerReady, OnDemuxerReady) IPC_MESSAGE_HANDLER(MediaPlayerHostMsg_ReadFromDemuxerAck, OnReadFromDemuxerAck) diff --git a/content/browser/media/android/browser_demuxer_android.h b/content/browser/media/android/browser_demuxer_android.h index 7601831..4ab7c8d 100644 --- a/content/browser/media/android/browser_demuxer_android.h +++ b/content/browser/media/android/browser_demuxer_android.h @@ -23,8 +23,7 @@ class CONTENT_EXPORT BrowserDemuxerAndroid : public BrowserMessageFilter { // BrowserMessageFilter overrides. virtual void OverrideThreadForMessage(const IPC::Message& message, BrowserThread::ID* thread) OVERRIDE; - virtual bool OnMessageReceived(const IPC::Message& message, - bool* message_was_ok) OVERRIDE; + virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; // Returns an uninitialized demuxer implementation associated with // |demuxer_client_id|, which can be used to communicate with the real demuxer diff --git a/content/browser/message_port_message_filter.cc b/content/browser/message_port_message_filter.cc index 6de26bd..ab3174b 100644 --- a/content/browser/message_port_message_filter.cc +++ b/content/browser/message_port_message_filter.cc @@ -22,10 +22,9 @@ void MessagePortMessageFilter::OnChannelClosing() { MessagePortService::GetInstance()->OnMessagePortMessageFilterClosing(this); } -bool MessagePortMessageFilter::OnMessageReceived(const IPC::Message& message, - bool* message_was_ok) { +bool MessagePortMessageFilter::OnMessageReceived(const IPC::Message& message) { bool handled = true; - IPC_BEGIN_MESSAGE_MAP_EX(MessagePortMessageFilter, message, *message_was_ok) + IPC_BEGIN_MESSAGE_MAP(MessagePortMessageFilter, message) IPC_MESSAGE_HANDLER(MessagePortHostMsg_CreateMessagePort, OnCreateMessagePort) IPC_MESSAGE_FORWARD(MessagePortHostMsg_DestroyMessagePort, @@ -44,7 +43,7 @@ bool MessagePortMessageFilter::OnMessageReceived(const IPC::Message& message, MessagePortService::GetInstance(), MessagePortService::SendQueuedMessages) IPC_MESSAGE_UNHANDLED(handled = false) - IPC_END_MESSAGE_MAP_EX() + IPC_END_MESSAGE_MAP() return handled; } diff --git a/content/browser/message_port_message_filter.h b/content/browser/message_port_message_filter.h index a324ad8..64d07d6 100644 --- a/content/browser/message_port_message_filter.h +++ b/content/browser/message_port_message_filter.h @@ -23,8 +23,7 @@ class CONTENT_EXPORT MessagePortMessageFilter : public BrowserMessageFilter { // BrowserMessageFilter implementation. virtual void OnChannelClosing() OVERRIDE; - virtual bool OnMessageReceived(const IPC::Message& message, - bool* message_was_ok) OVERRIDE; + virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; virtual void OnDestruct() const OVERRIDE; int GetNextRoutingID(); diff --git a/content/browser/mime_registry_message_filter.cc b/content/browser/mime_registry_message_filter.cc index d6e4505..0a823af 100644 --- a/content/browser/mime_registry_message_filter.cc +++ b/content/browser/mime_registry_message_filter.cc @@ -23,10 +23,9 @@ void MimeRegistryMessageFilter::OverrideThreadForMessage( *thread = BrowserThread::FILE; } -bool MimeRegistryMessageFilter::OnMessageReceived(const IPC::Message& message, - bool* message_was_ok) { +bool MimeRegistryMessageFilter::OnMessageReceived(const IPC::Message& message) { bool handled = true; - IPC_BEGIN_MESSAGE_MAP_EX(MimeRegistryMessageFilter, message, *message_was_ok) + IPC_BEGIN_MESSAGE_MAP(MimeRegistryMessageFilter, message) IPC_MESSAGE_HANDLER(MimeRegistryMsg_GetMimeTypeFromExtension, OnGetMimeTypeFromExtension) IPC_MESSAGE_HANDLER(MimeRegistryMsg_GetMimeTypeFromFile, diff --git a/content/browser/mime_registry_message_filter.h b/content/browser/mime_registry_message_filter.h index e86fe19..4237f50 100644 --- a/content/browser/mime_registry_message_filter.h +++ b/content/browser/mime_registry_message_filter.h @@ -17,8 +17,7 @@ class MimeRegistryMessageFilter : public BrowserMessageFilter { virtual void OverrideThreadForMessage( const IPC::Message& message, BrowserThread::ID* thread) OVERRIDE; - virtual bool OnMessageReceived(const IPC::Message& message, - bool* message_was_ok) OVERRIDE; + virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; private: virtual ~MimeRegistryMessageFilter(); diff --git a/content/browser/profiler_message_filter.cc b/content/browser/profiler_message_filter.cc index 825e9dc..ef8b2b7 100644 --- a/content/browser/profiler_message_filter.cc +++ b/content/browser/profiler_message_filter.cc @@ -22,17 +22,16 @@ void ProfilerMessageFilter::OnChannelConnected(int32 peer_pid) { Send(new ChildProcessMsg_SetProfilerStatus(status)); } -bool ProfilerMessageFilter::OnMessageReceived(const IPC::Message& message, - bool* message_was_ok) { +bool ProfilerMessageFilter::OnMessageReceived(const IPC::Message& message) { bool handled = true; - IPC_BEGIN_MESSAGE_MAP_EX(ProfilerMessageFilter, message, *message_was_ok) + IPC_BEGIN_MESSAGE_MAP(ProfilerMessageFilter, message) IPC_MESSAGE_HANDLER(ChildProcessHostMsg_ChildProfilerData, OnChildProfilerData) #if defined(USE_TCMALLOC) IPC_MESSAGE_HANDLER(ChildProcessHostMsg_TcmallocStats, OnTcmallocStats) #endif IPC_MESSAGE_UNHANDLED(handled = false) - IPC_END_MESSAGE_MAP_EX() + IPC_END_MESSAGE_MAP() return handled; } diff --git a/content/browser/profiler_message_filter.h b/content/browser/profiler_message_filter.h index bbac0ba..1575abc 100644 --- a/content/browser/profiler_message_filter.h +++ b/content/browser/profiler_message_filter.h @@ -24,8 +24,7 @@ class ProfilerMessageFilter : public BrowserMessageFilter { virtual void OnChannelConnected(int32 peer_pid) OVERRIDE; // BrowserMessageFilter implementation. - virtual bool OnMessageReceived(const IPC::Message& message, - bool* message_was_ok) OVERRIDE; + virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; protected: virtual ~ProfilerMessageFilter(); diff --git a/content/browser/push_messaging_message_filter.cc b/content/browser/push_messaging_message_filter.cc index fa8e8a5..e0787a7 100644 --- a/content/browser/push_messaging_message_filter.cc +++ b/content/browser/push_messaging_message_filter.cc @@ -16,10 +16,10 @@ PushMessagingMessageFilter::PushMessagingMessageFilter() PushMessagingMessageFilter::~PushMessagingMessageFilter() {} -bool PushMessagingMessageFilter::OnMessageReceived(const IPC::Message& message, - bool* message_was_ok) { +bool PushMessagingMessageFilter::OnMessageReceived( + const IPC::Message& message) { bool handled = true; - IPC_BEGIN_MESSAGE_MAP_EX(PushMessagingMessageFilter, message, *message_was_ok) + IPC_BEGIN_MESSAGE_MAP(PushMessagingMessageFilter, message) IPC_MESSAGE_HANDLER(PushMessagingHostMsg_Register, OnRegister) IPC_MESSAGE_UNHANDLED(handled = false) IPC_END_MESSAGE_MAP() diff --git a/content/browser/push_messaging_message_filter.h b/content/browser/push_messaging_message_filter.h index 1eb7003..44efd7f 100644 --- a/content/browser/push_messaging_message_filter.h +++ b/content/browser/push_messaging_message_filter.h @@ -20,8 +20,7 @@ class PushMessagingMessageFilter : public BrowserMessageFilter { virtual ~PushMessagingMessageFilter(); // BrowserMessageFilter implementation. - virtual bool OnMessageReceived(const IPC::Message& message, - bool* message_was_ok) OVERRIDE; + virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; void OnRegister(int routing_id, int callbacks_id, diff --git a/content/browser/quota_dispatcher_host.cc b/content/browser/quota_dispatcher_host.cc index ca636fe..fcee633 100644 --- a/content/browser/quota_dispatcher_host.cc +++ b/content/browser/quota_dispatcher_host.cc @@ -220,17 +220,15 @@ QuotaDispatcherHost::QuotaDispatcherHost( weak_factory_(this) { } -bool QuotaDispatcherHost::OnMessageReceived( - const IPC::Message& message, bool* message_was_ok) { - *message_was_ok = true; +bool QuotaDispatcherHost::OnMessageReceived(const IPC::Message& message) { bool handled = true; - IPC_BEGIN_MESSAGE_MAP_EX(QuotaDispatcherHost, message, *message_was_ok) + IPC_BEGIN_MESSAGE_MAP(QuotaDispatcherHost, message) IPC_MESSAGE_HANDLER(QuotaHostMsg_QueryStorageUsageAndQuota, OnQueryStorageUsageAndQuota) IPC_MESSAGE_HANDLER(QuotaHostMsg_RequestStorageQuota, OnRequestStorageQuota) IPC_MESSAGE_UNHANDLED(handled = false) - IPC_END_MESSAGE_MAP_EX() + IPC_END_MESSAGE_MAP() return handled; } diff --git a/content/browser/quota_dispatcher_host.h b/content/browser/quota_dispatcher_host.h index d7c1571..d241ab5 100644 --- a/content/browser/quota_dispatcher_host.h +++ b/content/browser/quota_dispatcher_host.h @@ -31,8 +31,7 @@ class QuotaDispatcherHost : public BrowserMessageFilter { QuotaPermissionContext* permission_context); // BrowserMessageFilter: - virtual bool OnMessageReceived(const IPC::Message& message, - bool* message_was_ok) OVERRIDE; + virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; protected: virtual ~QuotaDispatcherHost(); diff --git a/content/browser/renderer_host/clipboard_message_filter.cc b/content/browser/renderer_host/clipboard_message_filter.cc index ab0d2fb9..3ea8071 100644 --- a/content/browser/renderer_host/clipboard_message_filter.cc +++ b/content/browser/renderer_host/clipboard_message_filter.cc @@ -77,10 +77,9 @@ void ClipboardMessageFilter::OverrideThreadForMessage( #endif } -bool ClipboardMessageFilter::OnMessageReceived(const IPC::Message& message, - bool* message_was_ok) { +bool ClipboardMessageFilter::OnMessageReceived(const IPC::Message& message) { bool handled = true; - IPC_BEGIN_MESSAGE_MAP_EX(ClipboardMessageFilter, message, *message_was_ok) + IPC_BEGIN_MESSAGE_MAP(ClipboardMessageFilter, message) IPC_MESSAGE_HANDLER(ClipboardHostMsg_WriteObjectsAsync, OnWriteObjectsAsync) IPC_MESSAGE_HANDLER(ClipboardHostMsg_WriteObjectsSync, OnWriteObjectsSync) IPC_MESSAGE_HANDLER(ClipboardHostMsg_GetSequenceNumber, OnGetSequenceNumber) diff --git a/content/browser/renderer_host/clipboard_message_filter.h b/content/browser/renderer_host/clipboard_message_filter.h index 2252696..3fcb94e 100644 --- a/content/browser/renderer_host/clipboard_message_filter.h +++ b/content/browser/renderer_host/clipboard_message_filter.h @@ -24,8 +24,7 @@ class ClipboardMessageFilter : public BrowserMessageFilter { virtual void OverrideThreadForMessage( const IPC::Message& message, BrowserThread::ID* thread) OVERRIDE; - virtual bool OnMessageReceived(const IPC::Message& message, - bool* message_was_ok) OVERRIDE; + virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; private: virtual ~ClipboardMessageFilter(); diff --git a/content/browser/renderer_host/database_message_filter.cc b/content/browser/renderer_host/database_message_filter.cc index d0f07ba..5dd3d7c 100644 --- a/content/browser/renderer_host/database_message_filter.cc +++ b/content/browser/renderer_host/database_message_filter.cc @@ -87,11 +87,9 @@ void DatabaseMessageFilter::OverrideThreadForMessage( } } -bool DatabaseMessageFilter::OnMessageReceived( - const IPC::Message& message, - bool* message_was_ok) { +bool DatabaseMessageFilter::OnMessageReceived(const IPC::Message& message) { bool handled = true; - IPC_BEGIN_MESSAGE_MAP_EX(DatabaseMessageFilter, message, *message_was_ok) + IPC_BEGIN_MESSAGE_MAP(DatabaseMessageFilter, message) IPC_MESSAGE_HANDLER_DELAY_REPLY(DatabaseHostMsg_OpenFile, OnDatabaseOpenFile) IPC_MESSAGE_HANDLER_DELAY_REPLY(DatabaseHostMsg_DeleteFile, @@ -107,7 +105,7 @@ bool DatabaseMessageFilter::OnMessageReceived( IPC_MESSAGE_HANDLER(DatabaseHostMsg_Closed, OnDatabaseClosed) IPC_MESSAGE_HANDLER(DatabaseHostMsg_HandleSqliteError, OnHandleSqliteError) IPC_MESSAGE_UNHANDLED(handled = false) - IPC_END_MESSAGE_MAP_EX() + IPC_END_MESSAGE_MAP() return handled; } diff --git a/content/browser/renderer_host/database_message_filter.h b/content/browser/renderer_host/database_message_filter.h index 5024335..aa99e03 100644 --- a/content/browser/renderer_host/database_message_filter.h +++ b/content/browser/renderer_host/database_message_filter.h @@ -25,8 +25,7 @@ class DatabaseMessageFilter virtual void OverrideThreadForMessage( const IPC::Message& message, BrowserThread::ID* thread) OVERRIDE; - virtual bool OnMessageReceived(const IPC::Message& message, - bool* message_was_ok) OVERRIDE; + virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; webkit_database::DatabaseTracker* database_tracker() const { return db_tracker_.get(); diff --git a/content/browser/renderer_host/file_utilities_message_filter.cc b/content/browser/renderer_host/file_utilities_message_filter.cc index e784ee3..d819c6d 100644 --- a/content/browser/renderer_host/file_utilities_message_filter.cc +++ b/content/browser/renderer_host/file_utilities_message_filter.cc @@ -25,10 +25,10 @@ void FileUtilitiesMessageFilter::OverrideThreadForMessage( *thread = BrowserThread::FILE; } -bool FileUtilitiesMessageFilter::OnMessageReceived(const IPC::Message& message, - bool* message_was_ok) { +bool FileUtilitiesMessageFilter::OnMessageReceived( + const IPC::Message& message) { bool handled = true; - IPC_BEGIN_MESSAGE_MAP_EX(FileUtilitiesMessageFilter, message, *message_was_ok) + IPC_BEGIN_MESSAGE_MAP(FileUtilitiesMessageFilter, message) IPC_MESSAGE_HANDLER(FileUtilitiesMsg_GetFileInfo, OnGetFileInfo) IPC_MESSAGE_UNHANDLED(handled = false) IPC_END_MESSAGE_MAP() diff --git a/content/browser/renderer_host/file_utilities_message_filter.h b/content/browser/renderer_host/file_utilities_message_filter.h index e067f2e..ecfbfe0 100644 --- a/content/browser/renderer_host/file_utilities_message_filter.h +++ b/content/browser/renderer_host/file_utilities_message_filter.h @@ -24,8 +24,7 @@ class FileUtilitiesMessageFilter : public BrowserMessageFilter { virtual void OverrideThreadForMessage( const IPC::Message& message, BrowserThread::ID* thread) OVERRIDE; - virtual bool OnMessageReceived(const IPC::Message& message, - bool* message_was_ok) OVERRIDE; + virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; private: virtual ~FileUtilitiesMessageFilter(); diff --git a/content/browser/renderer_host/gamepad_browser_message_filter.cc b/content/browser/renderer_host/gamepad_browser_message_filter.cc index f616a74..ef66a5c 100644 --- a/content/browser/renderer_host/gamepad_browser_message_filter.cc +++ b/content/browser/renderer_host/gamepad_browser_message_filter.cc @@ -21,16 +21,13 @@ GamepadBrowserMessageFilter::~GamepadBrowserMessageFilter() { } bool GamepadBrowserMessageFilter::OnMessageReceived( - const IPC::Message& message, - bool* message_was_ok) { + const IPC::Message& message) { bool handled = true; - IPC_BEGIN_MESSAGE_MAP_EX(GamepadBrowserMessageFilter, - message, - *message_was_ok) + IPC_BEGIN_MESSAGE_MAP(GamepadBrowserMessageFilter, message) IPC_MESSAGE_HANDLER(GamepadHostMsg_StartPolling, OnGamepadStartPolling) IPC_MESSAGE_HANDLER(GamepadHostMsg_StopPolling, OnGamepadStopPolling) IPC_MESSAGE_UNHANDLED(handled = false) - IPC_END_MESSAGE_MAP_EX() + IPC_END_MESSAGE_MAP() return handled; } diff --git a/content/browser/renderer_host/gamepad_browser_message_filter.h b/content/browser/renderer_host/gamepad_browser_message_filter.h index f328739..fefbf42 100644 --- a/content/browser/renderer_host/gamepad_browser_message_filter.h +++ b/content/browser/renderer_host/gamepad_browser_message_filter.h @@ -22,8 +22,7 @@ class GamepadBrowserMessageFilter : GamepadBrowserMessageFilter(); // BrowserMessageFilter implementation. - virtual bool OnMessageReceived(const IPC::Message& message, - bool* message_was_ok) OVERRIDE; + virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; // GamepadConsumer implementation. virtual void OnGamepadConnected( diff --git a/content/browser/renderer_host/gpu_message_filter.cc b/content/browser/renderer_host/gpu_message_filter.cc index 856d14b..3c22956 100644 --- a/content/browser/renderer_host/gpu_message_filter.cc +++ b/content/browser/renderer_host/gpu_message_filter.cc @@ -67,17 +67,15 @@ GpuMessageFilter::~GpuMessageFilter() { EndAllFrameSubscriptions(); } -bool GpuMessageFilter::OnMessageReceived( - const IPC::Message& message, - bool* message_was_ok) { +bool GpuMessageFilter::OnMessageReceived(const IPC::Message& message) { bool handled = true; - IPC_BEGIN_MESSAGE_MAP_EX(GpuMessageFilter, message, *message_was_ok) + IPC_BEGIN_MESSAGE_MAP(GpuMessageFilter, message) IPC_MESSAGE_HANDLER_DELAY_REPLY(GpuHostMsg_EstablishGpuChannel, OnEstablishGpuChannel) IPC_MESSAGE_HANDLER_DELAY_REPLY(GpuHostMsg_CreateViewCommandBuffer, OnCreateViewCommandBuffer) IPC_MESSAGE_UNHANDLED(handled = false) - IPC_END_MESSAGE_MAP_EX() + IPC_END_MESSAGE_MAP() return handled; } diff --git a/content/browser/renderer_host/gpu_message_filter.h b/content/browser/renderer_host/gpu_message_filter.h index 1d42fb2..327cd76 100644 --- a/content/browser/renderer_host/gpu_message_filter.h +++ b/content/browser/renderer_host/gpu_message_filter.h @@ -36,8 +36,7 @@ class GpuMessageFilter : public BrowserMessageFilter { RenderWidgetHelper* render_widget_helper); // BrowserMessageFilter methods: - virtual bool OnMessageReceived(const IPC::Message& message, - bool* message_was_ok) OVERRIDE; + virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; // This set of API is used to subscribe to frame presentation events. // See RenderWidgetHostViewFrameSubscriber for more details. diff --git a/content/browser/renderer_host/input/input_router_impl.cc b/content/browser/renderer_host/input/input_router_impl.cc index 4f12318..4c82f22 100644 --- a/content/browser/renderer_host/input/input_router_impl.cc +++ b/content/browser/renderer_host/input/input_router_impl.cc @@ -268,8 +268,7 @@ void InputRouterImpl::OnViewUpdated(int view_flags) { bool InputRouterImpl::OnMessageReceived(const IPC::Message& message) { bool handled = true; - bool message_is_ok = true; - IPC_BEGIN_MESSAGE_MAP_EX(InputRouterImpl, message, message_is_ok) + IPC_BEGIN_MESSAGE_MAP(InputRouterImpl, message) IPC_MESSAGE_HANDLER(InputHostMsg_HandleInputEvent_ACK, OnInputEventAck) IPC_MESSAGE_HANDLER(ViewHostMsg_MoveCaret_ACK, OnMsgMoveCaretAck) IPC_MESSAGE_HANDLER(ViewHostMsg_SelectRange_ACK, OnSelectRangeAck) @@ -280,9 +279,6 @@ bool InputRouterImpl::OnMessageReceived(const IPC::Message& message) { IPC_MESSAGE_UNHANDLED(handled = false) IPC_END_MESSAGE_MAP() - if (!message_is_ok) - ack_handler_->OnUnexpectedEventAck(InputAckHandler::BAD_ACK_MESSAGE); - return handled; } diff --git a/content/browser/renderer_host/input/touch_input_browsertest.cc b/content/browser/renderer_host/input/touch_input_browsertest.cc index 270f39c..2b273cc 100644 --- a/content/browser/renderer_host/input/touch_input_browsertest.cc +++ b/content/browser/renderer_host/input/touch_input_browsertest.cc @@ -108,8 +108,7 @@ class InputEventMessageFilter : public BrowserMessageFilter { } // BrowserMessageFilter: - virtual bool OnMessageReceived(const IPC::Message& message, - bool* message_was_ok) OVERRIDE { + virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE { if (message.type() == InputHostMsg_HandleInputEvent_ACK::ID) { InputHostMsg_HandleInputEvent_ACK::Param params; InputHostMsg_HandleInputEvent_ACK::Read(&message, ¶ms); diff --git a/content/browser/renderer_host/media/audio_input_renderer_host.cc b/content/browser/renderer_host/media/audio_input_renderer_host.cc index b536cf3..107914a 100644 --- a/content/browser/renderer_host/media/audio_input_renderer_host.cc +++ b/content/browser/renderer_host/media/audio_input_renderer_host.cc @@ -205,16 +205,15 @@ void AudioInputRendererHost::DoHandleError( DeleteEntryOnError(entry, AUDIO_INPUT_CONTROLLER_ERROR); } -bool AudioInputRendererHost::OnMessageReceived(const IPC::Message& message, - bool* message_was_ok) { +bool AudioInputRendererHost::OnMessageReceived(const IPC::Message& message) { bool handled = true; - IPC_BEGIN_MESSAGE_MAP_EX(AudioInputRendererHost, message, *message_was_ok) + IPC_BEGIN_MESSAGE_MAP(AudioInputRendererHost, message) IPC_MESSAGE_HANDLER(AudioInputHostMsg_CreateStream, OnCreateStream) IPC_MESSAGE_HANDLER(AudioInputHostMsg_RecordStream, OnRecordStream) IPC_MESSAGE_HANDLER(AudioInputHostMsg_CloseStream, OnCloseStream) IPC_MESSAGE_HANDLER(AudioInputHostMsg_SetVolume, OnSetVolume) IPC_MESSAGE_UNHANDLED(handled = false) - IPC_END_MESSAGE_MAP_EX() + IPC_END_MESSAGE_MAP() return handled; } diff --git a/content/browser/renderer_host/media/audio_input_renderer_host.h b/content/browser/renderer_host/media/audio_input_renderer_host.h index d31024a..93f92626 100644 --- a/content/browser/renderer_host/media/audio_input_renderer_host.h +++ b/content/browser/renderer_host/media/audio_input_renderer_host.h @@ -109,8 +109,7 @@ class CONTENT_EXPORT AudioInputRendererHost // BrowserMessageFilter implementation. virtual void OnChannelClosing() OVERRIDE; virtual void OnDestruct() const OVERRIDE; - virtual bool OnMessageReceived(const IPC::Message& message, - bool* message_was_ok) OVERRIDE; + virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; // AudioInputController::EventHandler implementation. virtual void OnCreated(media::AudioInputController* controller) OVERRIDE; diff --git a/content/browser/renderer_host/media/audio_renderer_host.cc b/content/browser/renderer_host/media/audio_renderer_host.cc index ea633c0..fd6b474 100644 --- a/content/browser/renderer_host/media/audio_renderer_host.cc +++ b/content/browser/renderer_host/media/audio_renderer_host.cc @@ -300,17 +300,16 @@ AudioRendererHost::DoGetOutputControllers(int render_view_id) const { /////////////////////////////////////////////////////////////////////////////// // IPC Messages handler -bool AudioRendererHost::OnMessageReceived(const IPC::Message& message, - bool* message_was_ok) { +bool AudioRendererHost::OnMessageReceived(const IPC::Message& message) { bool handled = true; - IPC_BEGIN_MESSAGE_MAP_EX(AudioRendererHost, message, *message_was_ok) + IPC_BEGIN_MESSAGE_MAP(AudioRendererHost, message) IPC_MESSAGE_HANDLER(AudioHostMsg_CreateStream, OnCreateStream) IPC_MESSAGE_HANDLER(AudioHostMsg_PlayStream, OnPlayStream) IPC_MESSAGE_HANDLER(AudioHostMsg_PauseStream, OnPauseStream) IPC_MESSAGE_HANDLER(AudioHostMsg_CloseStream, OnCloseStream) IPC_MESSAGE_HANDLER(AudioHostMsg_SetVolume, OnSetVolume) IPC_MESSAGE_UNHANDLED(handled = false) - IPC_END_MESSAGE_MAP_EX() + IPC_END_MESSAGE_MAP() return handled; } diff --git a/content/browser/renderer_host/media/audio_renderer_host.h b/content/browser/renderer_host/media/audio_renderer_host.h index 6aebb30..60556ee 100644 --- a/content/browser/renderer_host/media/audio_renderer_host.h +++ b/content/browser/renderer_host/media/audio_renderer_host.h @@ -82,8 +82,7 @@ class CONTENT_EXPORT AudioRendererHost : public BrowserMessageFilter { // BrowserMessageFilter implementation. virtual void OnChannelClosing() OVERRIDE; virtual void OnDestruct() const OVERRIDE; - virtual bool OnMessageReceived(const IPC::Message& message, - bool* message_was_ok) OVERRIDE; + virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; private: friend class AudioRendererHostTest; diff --git a/content/browser/renderer_host/media/device_request_message_filter.cc b/content/browser/renderer_host/media/device_request_message_filter.cc index 3ae8c1a..4aaf239 100644 --- a/content/browser/renderer_host/media/device_request_message_filter.cc +++ b/content/browser/renderer_host/media/device_request_message_filter.cc @@ -116,13 +116,13 @@ void DeviceRequestMessageFilter::DevicesEnumerated( requests_.erase(request_it); } -bool DeviceRequestMessageFilter::OnMessageReceived(const IPC::Message& message, - bool* message_was_ok) { +bool DeviceRequestMessageFilter::OnMessageReceived( + const IPC::Message& message) { bool handled = true; - IPC_BEGIN_MESSAGE_MAP_EX(DeviceRequestMessageFilter, message, *message_was_ok) + IPC_BEGIN_MESSAGE_MAP(DeviceRequestMessageFilter, message) IPC_MESSAGE_HANDLER(MediaStreamHostMsg_GetSources, OnGetSources) IPC_MESSAGE_UNHANDLED(handled = false) - IPC_END_MESSAGE_MAP_EX() + IPC_END_MESSAGE_MAP() return handled; } diff --git a/content/browser/renderer_host/media/device_request_message_filter.h b/content/browser/renderer_host/media/device_request_message_filter.h index f5f38b3..2ec54cc 100644 --- a/content/browser/renderer_host/media/device_request_message_filter.h +++ b/content/browser/renderer_host/media/device_request_message_filter.h @@ -53,8 +53,7 @@ class CONTENT_EXPORT DeviceRequestMessageFilter : public BrowserMessageFilter, const StreamDeviceInfoArray& devices) OVERRIDE; // BrowserMessageFilter implementation. - virtual bool OnMessageReceived(const IPC::Message& message, - bool* message_was_ok) OVERRIDE; + virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; virtual void OnChannelClosing() OVERRIDE; protected: diff --git a/content/browser/renderer_host/media/device_request_message_filter_unittest.cc b/content/browser/renderer_host/media/device_request_message_filter_unittest.cc index cb7d061..516e2fa 100644 --- a/content/browser/renderer_host/media/device_request_message_filter_unittest.cc +++ b/content/browser/renderer_host/media/device_request_message_filter_unittest.cc @@ -180,11 +180,7 @@ class DeviceRequestMessageFilterTest : public testing::Test { } void SendGetSourcesMessage(int request_id, const GURL& origin) { - // Since we're not actually sending IPC messages, this is a throw-away - // value. - bool message_was_ok; - host_->OnMessageReceived(MediaStreamHostMsg_GetSources(request_id, origin), - &message_was_ok); + host_->OnMessageReceived(MediaStreamHostMsg_GetSources(request_id, origin)); } void FireAudioDeviceCallback() { diff --git a/content/browser/renderer_host/media/media_stream_dispatcher_host.cc b/content/browser/renderer_host/media/media_stream_dispatcher_host.cc index 37e2e19..51b3395 100644 --- a/content/browser/renderer_host/media/media_stream_dispatcher_host.cc +++ b/content/browser/renderer_host/media/media_stream_dispatcher_host.cc @@ -91,10 +91,9 @@ void MediaStreamDispatcherHost::DeviceOpened( render_view_id, page_request_id, label, video_device)); } -bool MediaStreamDispatcherHost::OnMessageReceived( - const IPC::Message& message, bool* message_was_ok) { +bool MediaStreamDispatcherHost::OnMessageReceived(const IPC::Message& message) { bool handled = true; - IPC_BEGIN_MESSAGE_MAP_EX(MediaStreamDispatcherHost, message, *message_was_ok) + IPC_BEGIN_MESSAGE_MAP(MediaStreamDispatcherHost, message) IPC_MESSAGE_HANDLER(MediaStreamHostMsg_GenerateStream, OnGenerateStream) IPC_MESSAGE_HANDLER(MediaStreamHostMsg_CancelGenerateStream, OnCancelGenerateStream) @@ -109,7 +108,7 @@ bool MediaStreamDispatcherHost::OnMessageReceived( IPC_MESSAGE_HANDLER(MediaStreamHostMsg_CloseDevice, OnCloseDevice) IPC_MESSAGE_UNHANDLED(handled = false) - IPC_END_MESSAGE_MAP_EX() + IPC_END_MESSAGE_MAP() return handled; } diff --git a/content/browser/renderer_host/media/media_stream_dispatcher_host.h b/content/browser/renderer_host/media/media_stream_dispatcher_host.h index f34054e..079e5df 100644 --- a/content/browser/renderer_host/media/media_stream_dispatcher_host.h +++ b/content/browser/renderer_host/media/media_stream_dispatcher_host.h @@ -55,8 +55,7 @@ class CONTENT_EXPORT MediaStreamDispatcherHost : public BrowserMessageFilter, const StreamDeviceInfo& video_device) OVERRIDE; // BrowserMessageFilter implementation. - virtual bool OnMessageReceived(const IPC::Message& message, - bool* message_was_ok) OVERRIDE; + virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; virtual void OnChannelClosing() OVERRIDE; protected: diff --git a/content/browser/renderer_host/media/media_stream_track_metrics_host.cc b/content/browser/renderer_host/media/media_stream_track_metrics_host.cc index 2d3c7cd..9bae1f7 100644 --- a/content/browser/renderer_host/media/media_stream_track_metrics_host.cc +++ b/content/browser/renderer_host/media/media_stream_track_metrics_host.cc @@ -34,17 +34,14 @@ MediaStreamTrackMetricsHost::~MediaStreamTrackMetricsHost() { } bool MediaStreamTrackMetricsHost::OnMessageReceived( - const IPC::Message& message, - bool* message_was_ok) { + const IPC::Message& message) { bool handled = true; - IPC_BEGIN_MESSAGE_MAP_EX(MediaStreamTrackMetricsHost, - message, - *message_was_ok) + IPC_BEGIN_MESSAGE_MAP(MediaStreamTrackMetricsHost, message) IPC_MESSAGE_HANDLER(MediaStreamTrackMetricsHost_AddTrack, OnAddTrack) IPC_MESSAGE_HANDLER(MediaStreamTrackMetricsHost_RemoveTrack, OnRemoveTrack) IPC_MESSAGE_UNHANDLED(handled = false) - IPC_END_MESSAGE_MAP_EX() + IPC_END_MESSAGE_MAP() return handled; } diff --git a/content/browser/renderer_host/media/media_stream_track_metrics_host.h b/content/browser/renderer_host/media/media_stream_track_metrics_host.h index b0d18f1..081b0d5 100644 --- a/content/browser/renderer_host/media/media_stream_track_metrics_host.h +++ b/content/browser/renderer_host/media/media_stream_track_metrics_host.h @@ -34,8 +34,7 @@ class MediaStreamTrackMetricsHost virtual ~MediaStreamTrackMetricsHost(); // BrowserMessageFilter override. - virtual bool OnMessageReceived(const IPC::Message& message, - bool* message_was_ok) OVERRIDE; + virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; private: void OnAddTrack(uint64 id, bool is_audio, bool is_remote); diff --git a/content/browser/renderer_host/media/midi_dispatcher_host.cc b/content/browser/renderer_host/media/midi_dispatcher_host.cc index 2863e11..f006c14 100644 --- a/content/browser/renderer_host/media/midi_dispatcher_host.cc +++ b/content/browser/renderer_host/media/midi_dispatcher_host.cc @@ -24,16 +24,15 @@ MidiDispatcherHost::MidiDispatcherHost(int render_process_id, MidiDispatcherHost::~MidiDispatcherHost() { } -bool MidiDispatcherHost::OnMessageReceived(const IPC::Message& message, - bool* message_was_ok) { +bool MidiDispatcherHost::OnMessageReceived(const IPC::Message& message) { bool handled = true; - IPC_BEGIN_MESSAGE_MAP_EX(MidiDispatcherHost, message, *message_was_ok) + IPC_BEGIN_MESSAGE_MAP(MidiDispatcherHost, message) IPC_MESSAGE_HANDLER(MidiHostMsg_RequestSysExPermission, OnRequestSysExPermission) IPC_MESSAGE_HANDLER(MidiHostMsg_CancelSysExPermissionRequest, OnCancelSysExPermissionRequest) IPC_MESSAGE_UNHANDLED(handled = false) - IPC_END_MESSAGE_MAP_EX() + IPC_END_MESSAGE_MAP() return handled; } diff --git a/content/browser/renderer_host/media/midi_dispatcher_host.h b/content/browser/renderer_host/media/midi_dispatcher_host.h index d8b3533..c623b3d 100644 --- a/content/browser/renderer_host/media/midi_dispatcher_host.h +++ b/content/browser/renderer_host/media/midi_dispatcher_host.h @@ -21,8 +21,7 @@ class MidiDispatcherHost : public BrowserMessageFilter { MidiDispatcherHost(int render_process_id, BrowserContext* browser_context); // BrowserMessageFilter implementation. - virtual bool OnMessageReceived(const IPC::Message& message, - bool* message_was_ok) OVERRIDE; + virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; virtual void OverrideThreadForMessage( const IPC::Message& message, BrowserThread::ID* thread) OVERRIDE; diff --git a/content/browser/renderer_host/media/midi_host.cc b/content/browser/renderer_host/media/midi_host.cc index 9c85b73..c55022b 100644 --- a/content/browser/renderer_host/media/midi_host.cc +++ b/content/browser/renderer_host/media/midi_host.cc @@ -67,14 +67,13 @@ void MidiHost::OnDestruct() const { } // IPC Messages handler -bool MidiHost::OnMessageReceived(const IPC::Message& message, - bool* message_was_ok) { +bool MidiHost::OnMessageReceived(const IPC::Message& message) { bool handled = true; - IPC_BEGIN_MESSAGE_MAP_EX(MidiHost, message, *message_was_ok) + IPC_BEGIN_MESSAGE_MAP(MidiHost, message) IPC_MESSAGE_HANDLER(MidiHostMsg_StartSession, OnStartSession) IPC_MESSAGE_HANDLER(MidiHostMsg_SendData, OnSendData) IPC_MESSAGE_UNHANDLED(handled = false) - IPC_END_MESSAGE_MAP_EX() + IPC_END_MESSAGE_MAP() return handled; } diff --git a/content/browser/renderer_host/media/midi_host.h b/content/browser/renderer_host/media/midi_host.h index a8e84f2..90c061a 100644 --- a/content/browser/renderer_host/media/midi_host.h +++ b/content/browser/renderer_host/media/midi_host.h @@ -32,8 +32,7 @@ class CONTENT_EXPORT MidiHost // BrowserMessageFilter implementation. virtual void OnDestruct() const OVERRIDE; - virtual bool OnMessageReceived(const IPC::Message& message, - bool* message_was_ok) OVERRIDE; + virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; // MidiManagerClient implementation. virtual void CompleteStartSession(int client_id, diff --git a/content/browser/renderer_host/media/peer_connection_tracker_host.cc b/content/browser/renderer_host/media/peer_connection_tracker_host.cc index 96029b9..a5e0ba3 100644 --- a/content/browser/renderer_host/media/peer_connection_tracker_host.cc +++ b/content/browser/renderer_host/media/peer_connection_tracker_host.cc @@ -12,11 +12,10 @@ PeerConnectionTrackerHost::PeerConnectionTrackerHost(int render_process_id) : BrowserMessageFilter(PeerConnectionTrackerMsgStart), render_process_id_(render_process_id) {} -bool PeerConnectionTrackerHost::OnMessageReceived(const IPC::Message& message, - bool* message_was_ok) { +bool PeerConnectionTrackerHost::OnMessageReceived(const IPC::Message& message) { bool handled = true; - IPC_BEGIN_MESSAGE_MAP_EX(PeerConnectionTrackerHost, message, *message_was_ok) + IPC_BEGIN_MESSAGE_MAP(PeerConnectionTrackerHost, message) IPC_MESSAGE_HANDLER(PeerConnectionTrackerHost_AddPeerConnection, OnAddPeerConnection) IPC_MESSAGE_HANDLER(PeerConnectionTrackerHost_RemovePeerConnection, @@ -26,7 +25,7 @@ bool PeerConnectionTrackerHost::OnMessageReceived(const IPC::Message& message, IPC_MESSAGE_HANDLER(PeerConnectionTrackerHost_AddStats, OnAddStats) IPC_MESSAGE_HANDLER(PeerConnectionTrackerHost_GetUserMedia, OnGetUserMedia) IPC_MESSAGE_UNHANDLED(handled = false) - IPC_END_MESSAGE_MAP_EX() + IPC_END_MESSAGE_MAP() return handled; } diff --git a/content/browser/renderer_host/media/peer_connection_tracker_host.h b/content/browser/renderer_host/media/peer_connection_tracker_host.h index 46830a2..6a411e8 100644 --- a/content/browser/renderer_host/media/peer_connection_tracker_host.h +++ b/content/browser/renderer_host/media/peer_connection_tracker_host.h @@ -23,8 +23,7 @@ class PeerConnectionTrackerHost : public BrowserMessageFilter { PeerConnectionTrackerHost(int render_process_id); // content::BrowserMessageFilter override. - virtual bool OnMessageReceived(const IPC::Message& message, - bool* message_was_ok) OVERRIDE; + virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; virtual void OverrideThreadForMessage(const IPC::Message& message, BrowserThread::ID* thread) OVERRIDE; diff --git a/content/browser/renderer_host/media/video_capture_host.cc b/content/browser/renderer_host/media/video_capture_host.cc index 14ab5d4..be571bf 100644 --- a/content/browser/renderer_host/media/video_capture_host.cc +++ b/content/browser/renderer_host/media/video_capture_host.cc @@ -194,10 +194,9 @@ void VideoCaptureHost::DoEndedOnIOThread( /////////////////////////////////////////////////////////////////////////////// // IPC Messages handler. -bool VideoCaptureHost::OnMessageReceived(const IPC::Message& message, - bool* message_was_ok) { +bool VideoCaptureHost::OnMessageReceived(const IPC::Message& message) { bool handled = true; - IPC_BEGIN_MESSAGE_MAP_EX(VideoCaptureHost, message, *message_was_ok) + IPC_BEGIN_MESSAGE_MAP(VideoCaptureHost, message) IPC_MESSAGE_HANDLER(VideoCaptureHostMsg_Start, OnStartCapture) IPC_MESSAGE_HANDLER(VideoCaptureHostMsg_Pause, OnPauseCapture) IPC_MESSAGE_HANDLER(VideoCaptureHostMsg_Stop, OnStopCapture) @@ -207,7 +206,7 @@ bool VideoCaptureHost::OnMessageReceived(const IPC::Message& message, IPC_MESSAGE_HANDLER(VideoCaptureHostMsg_GetDeviceFormatsInUse, OnGetDeviceFormatsInUse) IPC_MESSAGE_UNHANDLED(handled = false) - IPC_END_MESSAGE_MAP_EX() + IPC_END_MESSAGE_MAP() return handled; } diff --git a/content/browser/renderer_host/media/video_capture_host.h b/content/browser/renderer_host/media/video_capture_host.h index 25d6947..caecb1a 100644 --- a/content/browser/renderer_host/media/video_capture_host.h +++ b/content/browser/renderer_host/media/video_capture_host.h @@ -73,8 +73,7 @@ class CONTENT_EXPORT VideoCaptureHost // BrowserMessageFilter implementation. virtual void OnChannelClosing() OVERRIDE; virtual void OnDestruct() const OVERRIDE; - virtual bool OnMessageReceived(const IPC::Message& message, - bool* message_was_ok) OVERRIDE; + virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; // VideoCaptureControllerEventHandler implementation. virtual void OnError(const VideoCaptureControllerID& id) OVERRIDE; diff --git a/content/browser/renderer_host/media/webrtc_identity_service_host.cc b/content/browser/renderer_host/media/webrtc_identity_service_host.cc index 1c7291e2..0cdd518 100644 --- a/content/browser/renderer_host/media/webrtc_identity_service_host.cc +++ b/content/browser/renderer_host/media/webrtc_identity_service_host.cc @@ -26,14 +26,13 @@ WebRTCIdentityServiceHost::~WebRTCIdentityServiceHost() { cancel_callback_.Run(); } -bool WebRTCIdentityServiceHost::OnMessageReceived(const IPC::Message& message, - bool* message_was_ok) { +bool WebRTCIdentityServiceHost::OnMessageReceived(const IPC::Message& message) { bool handled = true; - IPC_BEGIN_MESSAGE_MAP_EX(WebRTCIdentityServiceHost, message, *message_was_ok) + IPC_BEGIN_MESSAGE_MAP(WebRTCIdentityServiceHost, message) IPC_MESSAGE_HANDLER(WebRTCIdentityMsg_RequestIdentity, OnRequestIdentity) IPC_MESSAGE_HANDLER(WebRTCIdentityMsg_CancelRequest, OnCancelRequest) IPC_MESSAGE_UNHANDLED(handled = false) - IPC_END_MESSAGE_MAP_EX() + IPC_END_MESSAGE_MAP() return handled; } diff --git a/content/browser/renderer_host/media/webrtc_identity_service_host.h b/content/browser/renderer_host/media/webrtc_identity_service_host.h index 079e307..7bc8233 100644 --- a/content/browser/renderer_host/media/webrtc_identity_service_host.h +++ b/content/browser/renderer_host/media/webrtc_identity_service_host.h @@ -33,8 +33,7 @@ class CONTENT_EXPORT WebRTCIdentityServiceHost : public BrowserMessageFilter { virtual ~WebRTCIdentityServiceHost(); // content::BrowserMessageFilter override. - virtual bool OnMessageReceived(const IPC::Message& message, - bool* message_was_ok) OVERRIDE; + virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; private: // |sequence_number| is the same as in the OnRequestIdentity call. diff --git a/content/browser/renderer_host/media/webrtc_identity_service_host_unittest.cc b/content/browser/renderer_host/media/webrtc_identity_service_host_unittest.cc index 9e336d1..a785a22 100644 --- a/content/browser/renderer_host/media/webrtc_identity_service_host_unittest.cc +++ b/content/browser/renderer_host/media/webrtc_identity_service_host_unittest.cc @@ -73,10 +73,8 @@ class WebRTCIdentityServiceHostForTest : public WebRTCIdentityServiceHost { return true; } - virtual bool OnMessageReceived(const IPC::Message& message, - bool* message_was_ok) OVERRIDE { - return WebRTCIdentityServiceHost::OnMessageReceived(message, - message_was_ok); + virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE { + return WebRTCIdentityServiceHost::OnMessageReceived(message); } IPC::Message GetLastMessage() { return messages_.back(); } @@ -103,20 +101,15 @@ class WebRTCIdentityServiceHostTest : public ::testing::Test { host_(new WebRTCIdentityServiceHostForTest(store_.get())) {} void SendRequestToHost() { - bool ok; host_->OnMessageReceived( WebRTCIdentityMsg_RequestIdentity(FAKE_SEQUENCE_NUMBER, GURL(FAKE_ORIGIN), FAKE_IDENTITY_NAME, - FAKE_COMMON_NAME), - &ok); - ASSERT_TRUE(ok); + FAKE_COMMON_NAME)); } void SendCancelRequestToHost() { - bool ok; - host_->OnMessageReceived(WebRTCIdentityMsg_CancelRequest(), &ok); - ASSERT_TRUE(ok); + host_->OnMessageReceived(WebRTCIdentityMsg_CancelRequest()); } void VerifyRequestFailedMessage(int error) { diff --git a/content/browser/renderer_host/memory_benchmark_message_filter.cc b/content/browser/renderer_host/memory_benchmark_message_filter.cc index 35b2884..6073253 100644 --- a/content/browser/renderer_host/memory_benchmark_message_filter.cc +++ b/content/browser/renderer_host/memory_benchmark_message_filter.cc @@ -17,12 +17,9 @@ MemoryBenchmarkMessageFilter::MemoryBenchmarkMessageFilter() } bool MemoryBenchmarkMessageFilter::OnMessageReceived( - const IPC::Message& message, - bool* message_was_ok) { + const IPC::Message& message) { bool handled = true; - IPC_BEGIN_MESSAGE_MAP_EX(MemoryBenchmarkMessageFilter, - message, - *message_was_ok) + IPC_BEGIN_MESSAGE_MAP(MemoryBenchmarkMessageFilter, message) IPC_MESSAGE_HANDLER(MemoryBenchmarkHostMsg_HeapProfilerDump, OnHeapProfilerDump) IPC_MESSAGE_UNHANDLED(handled = false) diff --git a/content/browser/renderer_host/memory_benchmark_message_filter.h b/content/browser/renderer_host/memory_benchmark_message_filter.h index da5a6aa..7255ab9 100644 --- a/content/browser/renderer_host/memory_benchmark_message_filter.h +++ b/content/browser/renderer_host/memory_benchmark_message_filter.h @@ -15,8 +15,7 @@ class MemoryBenchmarkMessageFilter : public BrowserMessageFilter { public: MemoryBenchmarkMessageFilter(); - virtual bool OnMessageReceived(const IPC::Message& message, - bool* message_was_ok) OVERRIDE; + virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; private: virtual ~MemoryBenchmarkMessageFilter(); diff --git a/content/browser/renderer_host/p2p/socket_dispatcher_host.cc b/content/browser/renderer_host/p2p/socket_dispatcher_host.cc index 4a09469..e5f73de 100644 --- a/content/browser/renderer_host/p2p/socket_dispatcher_host.cc +++ b/content/browser/renderer_host/p2p/socket_dispatcher_host.cc @@ -120,10 +120,9 @@ void P2PSocketDispatcherHost::OnDestruct() const { BrowserThread::DeleteOnIOThread::Destruct(this); } -bool P2PSocketDispatcherHost::OnMessageReceived(const IPC::Message& message, - bool* message_was_ok) { +bool P2PSocketDispatcherHost::OnMessageReceived(const IPC::Message& message) { bool handled = true; - IPC_BEGIN_MESSAGE_MAP_EX(P2PSocketDispatcherHost, message, *message_was_ok) + IPC_BEGIN_MESSAGE_MAP(P2PSocketDispatcherHost, message) IPC_MESSAGE_HANDLER(P2PHostMsg_StartNetworkNotifications, OnStartNetworkNotifications) IPC_MESSAGE_HANDLER(P2PHostMsg_StopNetworkNotifications, @@ -136,7 +135,7 @@ bool P2PSocketDispatcherHost::OnMessageReceived(const IPC::Message& message, IPC_MESSAGE_HANDLER(P2PHostMsg_SetOption, OnSetOption) IPC_MESSAGE_HANDLER(P2PHostMsg_DestroySocket, OnDestroySocket) IPC_MESSAGE_UNHANDLED(handled = false) - IPC_END_MESSAGE_MAP_EX() + IPC_END_MESSAGE_MAP() return handled; } diff --git a/content/browser/renderer_host/p2p/socket_dispatcher_host.h b/content/browser/renderer_host/p2p/socket_dispatcher_host.h index 84bba57..b3c451a 100644 --- a/content/browser/renderer_host/p2p/socket_dispatcher_host.h +++ b/content/browser/renderer_host/p2p/socket_dispatcher_host.h @@ -40,8 +40,7 @@ class P2PSocketDispatcherHost // content::BrowserMessageFilter overrides. virtual void OnChannelClosing() OVERRIDE; virtual void OnDestruct() const OVERRIDE; - virtual bool OnMessageReceived(const IPC::Message& message, - bool* message_was_ok) OVERRIDE; + virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; // net::NetworkChangeNotifier::IPAddressObserver interface. virtual void OnIPAddressChanged() OVERRIDE; diff --git a/content/browser/renderer_host/pepper/pepper_message_filter.cc b/content/browser/renderer_host/pepper/pepper_message_filter.cc index 21cdc9f..0eaa5ec 100644 --- a/content/browser/renderer_host/pepper/pepper_message_filter.cc +++ b/content/browser/renderer_host/pepper/pepper_message_filter.cc @@ -16,14 +16,13 @@ PepperMessageFilter::PepperMessageFilter() PepperMessageFilter::~PepperMessageFilter() {} -bool PepperMessageFilter::OnMessageReceived(const IPC::Message& msg, - bool* message_was_ok) { +bool PepperMessageFilter::OnMessageReceived(const IPC::Message& msg) { bool handled = true; - IPC_BEGIN_MESSAGE_MAP_EX(PepperMessageFilter, msg, *message_was_ok) + IPC_BEGIN_MESSAGE_MAP(PepperMessageFilter, msg) IPC_MESSAGE_HANDLER(PpapiHostMsg_PPBX509Certificate_ParseDER, OnX509CertificateParseDER) IPC_MESSAGE_UNHANDLED(handled = false) - IPC_END_MESSAGE_MAP_EX() + IPC_END_MESSAGE_MAP() return handled; } diff --git a/content/browser/renderer_host/pepper/pepper_message_filter.h b/content/browser/renderer_host/pepper/pepper_message_filter.h index 3f5010e..68dac47 100644 --- a/content/browser/renderer_host/pepper/pepper_message_filter.h +++ b/content/browser/renderer_host/pepper/pepper_message_filter.h @@ -24,8 +24,7 @@ class PepperMessageFilter : public BrowserMessageFilter { PepperMessageFilter(); // BrowserMessageFilter methods. - virtual bool OnMessageReceived(const IPC::Message& message, - bool* message_was_ok) OVERRIDE; + virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; protected: virtual ~PepperMessageFilter(); diff --git a/content/browser/renderer_host/pepper/pepper_renderer_connection.cc b/content/browser/renderer_host/pepper/pepper_renderer_connection.cc index 08bad0c..8c233bb 100644 --- a/content/browser/renderer_host/pepper/pepper_renderer_connection.cc +++ b/content/browser/renderer_host/pepper/pepper_renderer_connection.cc @@ -132,13 +132,12 @@ BrowserPpapiHostImpl* PepperRendererConnection::GetHostForChildProcess( return host; } -bool PepperRendererConnection::OnMessageReceived(const IPC::Message& msg, - bool* message_was_ok) { +bool PepperRendererConnection::OnMessageReceived(const IPC::Message& msg) { if (in_process_host_->GetPpapiHost()->OnMessageReceived(msg)) return true; bool handled = true; - IPC_BEGIN_MESSAGE_MAP_EX(PepperRendererConnection, msg, *message_was_ok) + IPC_BEGIN_MESSAGE_MAP(PepperRendererConnection, msg) IPC_MESSAGE_HANDLER(PpapiHostMsg_CreateResourceHostsFromHost, OnMsgCreateResourceHostsFromHost) IPC_MESSAGE_HANDLER(ViewHostMsg_DidCreateInProcessInstance, @@ -146,7 +145,7 @@ bool PepperRendererConnection::OnMessageReceived(const IPC::Message& msg, IPC_MESSAGE_HANDLER(ViewHostMsg_DidDeleteInProcessInstance, OnMsgDidDeleteInProcessInstance) IPC_MESSAGE_UNHANDLED(handled = false) - IPC_END_MESSAGE_MAP_EX() + IPC_END_MESSAGE_MAP() return handled; } diff --git a/content/browser/renderer_host/pepper/pepper_renderer_connection.h b/content/browser/renderer_host/pepper/pepper_renderer_connection.h index 157827a..5683ab9 100644 --- a/content/browser/renderer_host/pepper/pepper_renderer_connection.h +++ b/content/browser/renderer_host/pepper/pepper_renderer_connection.h @@ -36,8 +36,7 @@ class PepperRendererConnection : public BrowserMessageFilter { explicit PepperRendererConnection(int render_process_id); // BrowserMessageFilter overrides. - virtual bool OnMessageReceived(const IPC::Message& msg, - bool* message_was_ok) OVERRIDE; + virtual bool OnMessageReceived(const IPC::Message& msg) OVERRIDE; private: virtual ~PepperRendererConnection(); diff --git a/content/browser/renderer_host/render_message_filter.cc b/content/browser/renderer_host/render_message_filter.cc index 11f80ee..a74708d 100644 --- a/content/browser/renderer_host/render_message_filter.cc +++ b/content/browser/renderer_host/render_message_filter.cc @@ -395,10 +395,9 @@ void RenderMessageFilter::OnChannelConnected(int32 peer_id) { cpu_usage_sample_time_ = base::TimeTicks::Now(); } -bool RenderMessageFilter::OnMessageReceived(const IPC::Message& message, - bool* message_was_ok) { +bool RenderMessageFilter::OnMessageReceived(const IPC::Message& message) { bool handled = true; - IPC_BEGIN_MESSAGE_MAP_EX(RenderMessageFilter, message, *message_was_ok) + IPC_BEGIN_MESSAGE_MAP(RenderMessageFilter, message) #if defined(OS_WIN) IPC_MESSAGE_HANDLER(ViewHostMsg_PreCacheFontCharacters, OnPreCacheFontCharacters) @@ -470,7 +469,7 @@ bool RenderMessageFilter::OnMessageReceived(const IPC::Message& message, IPC_MESSAGE_HANDLER(ViewHostMsg_RunWebAudioMediaCodec, OnWebAudioMediaCodec) #endif IPC_MESSAGE_UNHANDLED(handled = false) - IPC_END_MESSAGE_MAP_EX() + IPC_END_MESSAGE_MAP() return handled; } diff --git a/content/browser/renderer_host/render_message_filter.h b/content/browser/renderer_host/render_message_filter.h index 0f355d7..c3123a2 100644 --- a/content/browser/renderer_host/render_message_filter.h +++ b/content/browser/renderer_host/render_message_filter.h @@ -101,8 +101,7 @@ class RenderMessageFilter : public BrowserMessageFilter { virtual void OnChannelConnected(int32 peer_pid) OVERRIDE; // BrowserMessageFilter methods: - virtual bool OnMessageReceived(const IPC::Message& message, - bool* message_was_ok) OVERRIDE; + virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; virtual void OnDestruct() const OVERRIDE; virtual base::TaskRunner* OverrideTaskRunnerForMessage( const IPC::Message& message) OVERRIDE; diff --git a/content/browser/renderer_host/render_view_host_impl.cc b/content/browser/renderer_host/render_view_host_impl.cc index 562e611..5503d2f 100644 --- a/content/browser/renderer_host/render_view_host_impl.cc +++ b/content/browser/renderer_host/render_view_host_impl.cc @@ -969,8 +969,7 @@ bool RenderViewHostImpl::OnMessageReceived(const IPC::Message& msg) { return true; bool handled = true; - bool msg_is_ok = true; - IPC_BEGIN_MESSAGE_MAP_EX(RenderViewHostImpl, msg, msg_is_ok) + IPC_BEGIN_MESSAGE_MAP(RenderViewHostImpl, msg) IPC_MESSAGE_HANDLER(ViewHostMsg_ShowView, OnShowView) IPC_MESSAGE_HANDLER(ViewHostMsg_ShowWidget, OnShowWidget) IPC_MESSAGE_HANDLER(ViewHostMsg_ShowFullscreenWidget, @@ -1023,14 +1022,7 @@ bool RenderViewHostImpl::OnMessageReceived(const IPC::Message& msg) { // Have the super handle all other messages. IPC_MESSAGE_UNHANDLED( handled = RenderWidgetHostImpl::OnMessageReceived(msg)) - IPC_END_MESSAGE_MAP_EX() - - if (!msg_is_ok) { - // The message had a handler, but its de-serialization failed. - // Kill the renderer. - RecordAction(base::UserMetricsAction("BadMessageTerminate_RVH")); - GetProcess()->ReceivedBadMessage(); - } + IPC_END_MESSAGE_MAP() return handled; } diff --git a/content/browser/renderer_host/render_widget_host_impl.cc b/content/browser/renderer_host/render_widget_host_impl.cc index 3cfe3c7..4178e9d 100644 --- a/content/browser/renderer_host/render_widget_host_impl.cc +++ b/content/browser/renderer_host/render_widget_host_impl.cc @@ -449,8 +449,7 @@ bool RenderWidgetHostImpl::IsRenderView() const { bool RenderWidgetHostImpl::OnMessageReceived(const IPC::Message &msg) { bool handled = true; - bool msg_is_ok = true; - IPC_BEGIN_MESSAGE_MAP_EX(RenderWidgetHostImpl, msg, msg_is_ok) + IPC_BEGIN_MESSAGE_MAP(RenderWidgetHostImpl, msg) IPC_MESSAGE_HANDLER(InputHostMsg_QueueSyntheticGesture, OnQueueSyntheticGesture) IPC_MESSAGE_HANDLER(ViewHostMsg_RenderViewReady, OnRenderViewReady) @@ -461,7 +460,7 @@ bool RenderWidgetHostImpl::OnMessageReceived(const IPC::Message &msg) { IPC_MESSAGE_HANDLER(ViewHostMsg_RequestMove, OnRequestMove) IPC_MESSAGE_HANDLER(ViewHostMsg_SetTooltipText, OnSetTooltipText) IPC_MESSAGE_HANDLER_GENERIC(ViewHostMsg_SwapCompositorFrame, - msg_is_ok = OnSwapCompositorFrame(msg)) + OnSwapCompositorFrame(msg)) IPC_MESSAGE_HANDLER(ViewHostMsg_DidStopFlinging, OnFlingingStopped) IPC_MESSAGE_HANDLER(ViewHostMsg_UpdateRect, OnUpdateRect) IPC_MESSAGE_HANDLER(ViewHostMsg_Focus, OnFocus) @@ -495,7 +494,7 @@ bool RenderWidgetHostImpl::OnMessageReceived(const IPC::Message &msg) { OnImeCompositionRangeChanged) #endif IPC_MESSAGE_UNHANDLED(handled = false) - IPC_END_MESSAGE_MAP_EX() + IPC_END_MESSAGE_MAP() if (!handled && input_router_ && input_router_->OnMessageReceived(msg)) return true; @@ -503,11 +502,6 @@ bool RenderWidgetHostImpl::OnMessageReceived(const IPC::Message &msg) { if (!handled && view_ && view_->OnMessageReceived(msg)) return true; - if (!msg_is_ok) { - // The message de-serialization failed. Kill the renderer process. - RecordAction(base::UserMetricsAction("BadMessageTerminate_RWH")); - GetProcess()->ReceivedBadMessage(); - } return handled; } diff --git a/content/browser/renderer_host/socket_stream_dispatcher_host.cc b/content/browser/renderer_host/socket_stream_dispatcher_host.cc index 980b58d..b08b119 100644 --- a/content/browser/renderer_host/socket_stream_dispatcher_host.cc +++ b/content/browser/renderer_host/socket_stream_dispatcher_host.cc @@ -41,18 +41,18 @@ SocketStreamDispatcherHost::SocketStreamDispatcherHost( net::WebSocketJob::EnsureInit(); } -bool SocketStreamDispatcherHost::OnMessageReceived(const IPC::Message& message, - bool* message_was_ok) { +bool SocketStreamDispatcherHost::OnMessageReceived( + const IPC::Message& message) { if (on_shutdown_) return false; bool handled = true; - IPC_BEGIN_MESSAGE_MAP_EX(SocketStreamDispatcherHost, message, *message_was_ok) + IPC_BEGIN_MESSAGE_MAP(SocketStreamDispatcherHost, message) IPC_MESSAGE_HANDLER(SocketStreamHostMsg_Connect, OnConnect) IPC_MESSAGE_HANDLER(SocketStreamHostMsg_SendData, OnSendData) IPC_MESSAGE_HANDLER(SocketStreamHostMsg_Close, OnCloseReq) IPC_MESSAGE_UNHANDLED(handled = false) - IPC_END_MESSAGE_MAP_EX() + IPC_END_MESSAGE_MAP() return handled; } diff --git a/content/browser/renderer_host/socket_stream_dispatcher_host.h b/content/browser/renderer_host/socket_stream_dispatcher_host.h index 163f845..c083613 100644 --- a/content/browser/renderer_host/socket_stream_dispatcher_host.h +++ b/content/browser/renderer_host/socket_stream_dispatcher_host.h @@ -40,8 +40,7 @@ class SocketStreamDispatcherHost ResourceContext* resource_context); // BrowserMessageFilter: - virtual bool OnMessageReceived(const IPC::Message& message, - bool* message_was_ok) OVERRIDE; + virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; // Make this object inactive. // Remove all active SocketStreamHost objects. diff --git a/content/browser/renderer_host/text_input_client_mac_unittest.mm b/content/browser/renderer_host/text_input_client_mac_unittest.mm index fa1894f..eddff7b 100644 --- a/content/browser/renderer_host/text_input_client_mac_unittest.mm +++ b/content/browser/renderer_host/text_input_client_mac_unittest.mm @@ -104,9 +104,8 @@ class ScopedTestingThread { // Adapter for OnMessageReceived to ignore return type so it can be posted // to a MessageLoop. void CallOnMessageReceived(scoped_refptr<TextInputClientMessageFilter> filter, - const IPC::Message& message, - bool* message_was_ok) { - filter->OnMessageReceived(message, message_was_ok); + const IPC::Message& message) { + filter->OnMessageReceived(message); } } // namespace @@ -153,11 +152,10 @@ TEST_F(TextInputClientMacTest, NotFoundCharacterIndex) { scoped_ptr<IPC::Message> message( new TextInputClientReplyMsg_GotCharacterIndexForPoint( widget()->GetRoutingID(), kNotFoundValue)); - bool message_ok = true; // Set |WTF::notFound| to the index |kTaskDelayMs| after the previous // setting. PostTask(FROM_HERE, - base::Bind(&CallOnMessageReceived, filter, *message, &message_ok), + base::Bind(&CallOnMessageReceived, filter, *message), base::TimeDelta::FromMilliseconds(kTaskDelayMs) * 2); NSUInteger index = service()->GetCharacterIndexAtPoint( diff --git a/content/browser/renderer_host/text_input_client_message_filter.h b/content/browser/renderer_host/text_input_client_message_filter.h index 51b3225..4706346 100644 --- a/content/browser/renderer_host/text_input_client_message_filter.h +++ b/content/browser/renderer_host/text_input_client_message_filter.h @@ -25,8 +25,7 @@ class CONTENT_EXPORT TextInputClientMessageFilter explicit TextInputClientMessageFilter(int child_id); // BrowserMessageFilter override: - virtual bool OnMessageReceived(const IPC::Message& message, - bool* message_was_ok) OVERRIDE; + virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; protected: virtual ~TextInputClientMessageFilter(); diff --git a/content/browser/renderer_host/text_input_client_message_filter.mm b/content/browser/renderer_host/text_input_client_message_filter.mm index b24c51f..7650700 100644 --- a/content/browser/renderer_host/text_input_client_message_filter.mm +++ b/content/browser/renderer_host/text_input_client_message_filter.mm @@ -21,11 +21,9 @@ TextInputClientMessageFilter::TextInputClientMessageFilter(int child_id) } bool TextInputClientMessageFilter::OnMessageReceived( - const IPC::Message& message, - bool* message_was_ok) { + const IPC::Message& message) { bool handled = true; - IPC_BEGIN_MESSAGE_MAP_EX(TextInputClientMessageFilter, message, - *message_was_ok) + IPC_BEGIN_MESSAGE_MAP(TextInputClientMessageFilter, message) IPC_MESSAGE_HANDLER(TextInputClientReplyMsg_GotStringAtPoint, OnGotStringAtPoint) IPC_MESSAGE_HANDLER(TextInputClientReplyMsg_GotCharacterIndexForPoint, @@ -35,7 +33,7 @@ bool TextInputClientMessageFilter::OnMessageReceived( IPC_MESSAGE_HANDLER(TextInputClientReplyMsg_GotStringForRange, OnGotStringFromRange) IPC_MESSAGE_UNHANDLED(handled = false) - IPC_END_MESSAGE_MAP_EX() + IPC_END_MESSAGE_MAP() return handled; } diff --git a/content/browser/renderer_host/websocket_dispatcher_host.cc b/content/browser/renderer_host/websocket_dispatcher_host.cc index 4c4b0e5..2af2f08 100644 --- a/content/browser/renderer_host/websocket_dispatcher_host.cc +++ b/content/browser/renderer_host/websocket_dispatcher_host.cc @@ -47,8 +47,7 @@ WebSocketHost* WebSocketDispatcherHost::CreateWebSocketHost(int routing_id) { return new WebSocketHost(routing_id, this, get_context_callback_.Run()); } -bool WebSocketDispatcherHost::OnMessageReceived(const IPC::Message& message, - bool* message_was_ok) { +bool WebSocketDispatcherHost::OnMessageReceived(const IPC::Message& message) { switch (message.type()) { case WebSocketHostMsg_AddChannelRequest::ID: case WebSocketMsg_SendFrame::ID: @@ -81,7 +80,7 @@ bool WebSocketDispatcherHost::OnMessageReceived(const IPC::Message& message, << " from renderer."; return true; // We handled the message (by ignoring it). } - return host->OnMessageReceived(message, message_was_ok); + return host->OnMessageReceived(message); } bool WebSocketDispatcherHost::CanReadRawCookies() const { diff --git a/content/browser/renderer_host/websocket_dispatcher_host.h b/content/browser/renderer_host/websocket_dispatcher_host.h index c2812e5..b95b580 100644 --- a/content/browser/renderer_host/websocket_dispatcher_host.h +++ b/content/browser/renderer_host/websocket_dispatcher_host.h @@ -56,8 +56,7 @@ class CONTENT_EXPORT WebSocketDispatcherHost : public BrowserMessageFilter { const WebSocketHostFactory& websocket_host_factory); // BrowserMessageFilter: - virtual bool OnMessageReceived(const IPC::Message& message, - bool* message_was_ok) OVERRIDE; + virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; // The following methods are used by WebSocketHost::EventInterface to send // IPCs from the browser to the renderer or child process. Any of them may diff --git a/content/browser/renderer_host/websocket_dispatcher_host_unittest.cc b/content/browser/renderer_host/websocket_dispatcher_host_unittest.cc index f694649..27d5eee 100644 --- a/content/browser/renderer_host/websocket_dispatcher_host_unittest.cc +++ b/content/browser/renderer_host/websocket_dispatcher_host_unittest.cc @@ -31,8 +31,7 @@ class MockWebSocketHost : public WebSocketHost { virtual ~MockWebSocketHost() {} - virtual bool OnMessageReceived(const IPC::Message& message, - bool* message_was_ok) OVERRIDE{ + virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE{ received_messages_.push_back(message); return true; } @@ -78,9 +77,8 @@ TEST_F(WebSocketDispatcherHostTest, Construct) { } TEST_F(WebSocketDispatcherHostTest, UnrelatedMessage) { - bool message_was_ok = false; IPC::Message message; - EXPECT_FALSE(dispatcher_host_->OnMessageReceived(message, &message_was_ok)); + EXPECT_FALSE(dispatcher_host_->OnMessageReceived(message)); } TEST_F(WebSocketDispatcherHostTest, AddChannelRequest) { @@ -92,8 +90,7 @@ TEST_F(WebSocketDispatcherHostTest, AddChannelRequest) { WebSocketHostMsg_AddChannelRequest message( routing_id, socket_url, requested_protocols, origin); - bool message_was_ok = false; - ASSERT_TRUE(dispatcher_host_->OnMessageReceived(message, &message_was_ok)); + ASSERT_TRUE(dispatcher_host_->OnMessageReceived(message)); ASSERT_EQ(1U, mock_hosts_.size()); MockWebSocketHost* host = mock_hosts_[0]; @@ -110,9 +107,8 @@ TEST_F(WebSocketDispatcherHostTest, SendFrameButNoHostYet) { WebSocketMsg_SendFrame message( routing_id, true, WEB_SOCKET_MESSAGE_TYPE_TEXT, data); - bool message_was_ok = false; // Expected to be ignored. - EXPECT_TRUE(dispatcher_host_->OnMessageReceived(message, &message_was_ok)); + EXPECT_TRUE(dispatcher_host_->OnMessageReceived(message)); EXPECT_EQ(0U, mock_hosts_.size()); } @@ -127,17 +123,13 @@ TEST_F(WebSocketDispatcherHostTest, SendFrame) { WebSocketHostMsg_AddChannelRequest add_channel_message( routing_id, socket_url, requested_protocols, origin); - bool message_was_ok = false; - - ASSERT_TRUE(dispatcher_host_->OnMessageReceived( - add_channel_message, &message_was_ok)); + ASSERT_TRUE(dispatcher_host_->OnMessageReceived(add_channel_message)); std::vector<char> data; WebSocketMsg_SendFrame send_frame_message( routing_id, true, WEB_SOCKET_MESSAGE_TYPE_TEXT, data); - EXPECT_TRUE(dispatcher_host_->OnMessageReceived( - send_frame_message, &message_was_ok)); + EXPECT_TRUE(dispatcher_host_->OnMessageReceived(send_frame_message)); ASSERT_EQ(1U, mock_hosts_.size()); MockWebSocketHost* host = mock_hosts_[0]; diff --git a/content/browser/renderer_host/websocket_host.cc b/content/browser/renderer_host/websocket_host.cc index f0acd8a..ed398f8d 100644 --- a/content/browser/renderer_host/websocket_host.cc +++ b/content/browser/renderer_host/websocket_host.cc @@ -243,16 +243,15 @@ WebSocketHost::WebSocketHost(int routing_id, WebSocketHost::~WebSocketHost() {} -bool WebSocketHost::OnMessageReceived(const IPC::Message& message, - bool* message_was_ok) { +bool WebSocketHost::OnMessageReceived(const IPC::Message& message) { bool handled = true; - IPC_BEGIN_MESSAGE_MAP_EX(WebSocketHost, message, *message_was_ok) + IPC_BEGIN_MESSAGE_MAP(WebSocketHost, message) IPC_MESSAGE_HANDLER(WebSocketHostMsg_AddChannelRequest, OnAddChannelRequest) IPC_MESSAGE_HANDLER(WebSocketMsg_SendFrame, OnSendFrame) IPC_MESSAGE_HANDLER(WebSocketMsg_FlowControl, OnFlowControl) IPC_MESSAGE_HANDLER(WebSocketMsg_DropChannel, OnDropChannel) IPC_MESSAGE_UNHANDLED(handled = false) - IPC_END_MESSAGE_MAP_EX() + IPC_END_MESSAGE_MAP() return handled; } diff --git a/content/browser/renderer_host/websocket_host.h b/content/browser/renderer_host/websocket_host.h index bfe6304..148d6ed 100644 --- a/content/browser/renderer_host/websocket_host.h +++ b/content/browser/renderer_host/websocket_host.h @@ -42,8 +42,7 @@ class CONTENT_EXPORT WebSocketHost { // General message dispatch. WebSocketDispatcherHost::OnMessageReceived // delegates to this method after looking up the |routing_id|. - virtual bool OnMessageReceived(const IPC::Message& message, - bool* message_was_ok); + virtual bool OnMessageReceived(const IPC::Message& message); private: // Handlers for each message type, dispatched by OnMessageReceived(), as diff --git a/content/browser/resolve_proxy_msg_helper.cc b/content/browser/resolve_proxy_msg_helper.cc index 9932f77..5f0a6cd 100644 --- a/content/browser/resolve_proxy_msg_helper.cc +++ b/content/browser/resolve_proxy_msg_helper.cc @@ -26,10 +26,9 @@ ResolveProxyMsgHelper::ResolveProxyMsgHelper(net::ProxyService* proxy_service) proxy_service_(proxy_service) { } -bool ResolveProxyMsgHelper::OnMessageReceived(const IPC::Message& message, - bool* message_was_ok) { +bool ResolveProxyMsgHelper::OnMessageReceived(const IPC::Message& message) { bool handled = true; - IPC_BEGIN_MESSAGE_MAP_EX(ResolveProxyMsgHelper, message, *message_was_ok) + IPC_BEGIN_MESSAGE_MAP(ResolveProxyMsgHelper, message) IPC_MESSAGE_HANDLER_DELAY_REPLY(ViewHostMsg_ResolveProxy, OnResolveProxy) IPC_MESSAGE_UNHANDLED(handled = false) IPC_END_MESSAGE_MAP() diff --git a/content/browser/resolve_proxy_msg_helper.h b/content/browser/resolve_proxy_msg_helper.h index a55e669..167d946 100644 --- a/content/browser/resolve_proxy_msg_helper.h +++ b/content/browser/resolve_proxy_msg_helper.h @@ -38,8 +38,7 @@ class CONTENT_EXPORT ResolveProxyMsgHelper : public BrowserMessageFilter { explicit ResolveProxyMsgHelper(net::ProxyService* proxy_service); // BrowserMessageFilter implementation - virtual bool OnMessageReceived(const IPC::Message& message, - bool* message_was_ok) OVERRIDE; + virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; void OnResolveProxy(const GURL& url, IPC::Message* reply_msg); diff --git a/content/browser/screen_orientation/screen_orientation_dispatcher_host.cc b/content/browser/screen_orientation/screen_orientation_dispatcher_host.cc index fc443ec..ccc3e22 100644 --- a/content/browser/screen_orientation/screen_orientation_dispatcher_host.cc +++ b/content/browser/screen_orientation/screen_orientation_dispatcher_host.cc @@ -19,16 +19,14 @@ ScreenOrientationDispatcherHost::~ScreenOrientationDispatcherHost() { } bool ScreenOrientationDispatcherHost::OnMessageReceived( - const IPC::Message& message, bool* message_was_ok) { + const IPC::Message& message) { bool handled = true; - IPC_BEGIN_MESSAGE_MAP_EX(ScreenOrientationDispatcherHost, - message, - *message_was_ok) + IPC_BEGIN_MESSAGE_MAP(ScreenOrientationDispatcherHost, message) IPC_MESSAGE_HANDLER(ScreenOrientationHostMsg_Lock, OnLockRequest) IPC_MESSAGE_HANDLER(ScreenOrientationHostMsg_Unlock, OnUnlockRequest) IPC_MESSAGE_UNHANDLED(handled = false) - IPC_END_MESSAGE_MAP_EX() + IPC_END_MESSAGE_MAP() return handled; } diff --git a/content/browser/screen_orientation/screen_orientation_dispatcher_host.h b/content/browser/screen_orientation/screen_orientation_dispatcher_host.h index 28cd75d..401a9e0 100644 --- a/content/browser/screen_orientation/screen_orientation_dispatcher_host.h +++ b/content/browser/screen_orientation/screen_orientation_dispatcher_host.h @@ -22,7 +22,7 @@ class CONTENT_EXPORT ScreenOrientationDispatcherHost ScreenOrientationDispatcherHost(); // BrowserMessageFilter - virtual bool OnMessageReceived(const IPC::Message&, bool*) OVERRIDE; + virtual bool OnMessageReceived(const IPC::Message&) OVERRIDE; void OnOrientationChange(blink::WebScreenOrientationType orientation); diff --git a/content/browser/screen_orientation/screen_orientation_dispatcher_host_unittest.cc b/content/browser/screen_orientation/screen_orientation_dispatcher_host_unittest.cc index 3c50ca8..67f81de 100644 --- a/content/browser/screen_orientation/screen_orientation_dispatcher_host_unittest.cc +++ b/content/browser/screen_orientation/screen_orientation_dispatcher_host_unittest.cc @@ -63,12 +63,9 @@ class ScreenOrientationDispatcherHostTest : public testing::Test { TEST_F(ScreenOrientationDispatcherHostTest, NullProvider) { dispatcher_->SetProviderForTests(NULL); - bool message_was_ok = false; bool message_was_handled = dispatcher_->OnMessageReceived( ScreenOrientationHostMsg_Lock( - blink::WebScreenOrientationLockPortraitPrimary), &message_was_ok); - - EXPECT_TRUE(message_was_ok); + blink::WebScreenOrientationLockPortraitPrimary)); EXPECT_TRUE(message_was_handled); } @@ -92,14 +89,12 @@ TEST_F(ScreenOrientationDispatcherHostTest, ProviderLock) { int orientationsToTestCount = 7; for (int i = 0; i < orientationsToTestCount; ++i) { - bool message_was_ok = false; bool message_was_handled = false; blink::WebScreenOrientationLockType orientation = orientationsToTest[i]; message_was_handled = dispatcher_->OnMessageReceived( - ScreenOrientationHostMsg_Lock(orientation), &message_was_ok); + ScreenOrientationHostMsg_Lock(orientation)); - EXPECT_TRUE(message_was_ok); EXPECT_TRUE(message_was_handled); EXPECT_EQ(orientation, provider_->orientation()); } @@ -108,11 +103,9 @@ TEST_F(ScreenOrientationDispatcherHostTest, ProviderLock) { // Test that when receiving an unlock message, it is correctly dispatched to the // ScreenOrientationProvider. TEST_F(ScreenOrientationDispatcherHostTest, ProviderUnlock) { - bool message_was_ok = false; bool message_was_handled = dispatcher_->OnMessageReceived( - ScreenOrientationHostMsg_Unlock(), &message_was_ok); + ScreenOrientationHostMsg_Unlock()); - EXPECT_TRUE(message_was_ok); EXPECT_TRUE(message_was_handled); EXPECT_TRUE(provider_->unlock_called()); } diff --git a/content/browser/service_worker/service_worker_dispatcher_host.cc b/content/browser/service_worker/service_worker_dispatcher_host.cc index fa939dc..db9e373 100644 --- a/content/browser/service_worker/service_worker_dispatcher_host.cc +++ b/content/browser/service_worker/service_worker_dispatcher_host.cc @@ -85,11 +85,9 @@ void ServiceWorkerDispatcherHost::OnDestruct() const { } bool ServiceWorkerDispatcherHost::OnMessageReceived( - const IPC::Message& message, - bool* message_was_ok) { + const IPC::Message& message) { bool handled = true; - IPC_BEGIN_MESSAGE_MAP_EX( - ServiceWorkerDispatcherHost, message, *message_was_ok) + IPC_BEGIN_MESSAGE_MAP(ServiceWorkerDispatcherHost, message) IPC_MESSAGE_HANDLER(ServiceWorkerHostMsg_RegisterServiceWorker, OnRegisterServiceWorker) IPC_MESSAGE_HANDLER(ServiceWorkerHostMsg_UnregisterServiceWorker, diff --git a/content/browser/service_worker/service_worker_dispatcher_host.h b/content/browser/service_worker/service_worker_dispatcher_host.h index 7301eee..71999d5 100644 --- a/content/browser/service_worker/service_worker_dispatcher_host.h +++ b/content/browser/service_worker/service_worker_dispatcher_host.h @@ -34,8 +34,7 @@ class CONTENT_EXPORT ServiceWorkerDispatcherHost : public BrowserMessageFilter { // BrowserMessageFilter implementation virtual void OnFilterAdded(IPC::Channel* channel) OVERRIDE; virtual void OnDestruct() const OVERRIDE; - virtual bool OnMessageReceived(const IPC::Message& message, - bool* message_was_ok) OVERRIDE; + virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; // IPC::Sender implementation diff --git a/content/browser/service_worker/service_worker_dispatcher_host_unittest.cc b/content/browser/service_worker/service_worker_dispatcher_host_unittest.cc index 9c74777..e6e696c 100644 --- a/content/browser/service_worker/service_worker_dispatcher_host_unittest.cc +++ b/content/browser/service_worker/service_worker_dispatcher_host_unittest.cc @@ -83,11 +83,8 @@ TEST_F(ServiceWorkerDispatcherHostTest, DisabledCausesError) { new TestingServiceWorkerDispatcherHost( kRenderProcessId, context_wrapper(), helper_.get()); - bool handled; dispatcher_host->OnMessageReceived( - ServiceWorkerHostMsg_RegisterServiceWorker(-1, -1, -1, GURL(), GURL()), - &handled); - EXPECT_TRUE(handled); + ServiceWorkerHostMsg_RegisterServiceWorker(-1, -1, -1, GURL(), GURL())); // TODO(alecflett): Pump the message loop when this becomes async. ASSERT_EQ(1UL, dispatcher_host->ipc_sink()->message_count()); @@ -110,11 +107,8 @@ TEST_F(ServiceWorkerDispatcherHostTest, DISABLED_Enabled) { new TestingServiceWorkerDispatcherHost( kRenderProcessId, context_wrapper(), helper_.get()); - bool handled; dispatcher_host->OnMessageReceived( - ServiceWorkerHostMsg_RegisterServiceWorker(-1, -1, -1, GURL(), GURL()), - &handled); - EXPECT_TRUE(handled); + ServiceWorkerHostMsg_RegisterServiceWorker(-1, -1, -1, GURL(), GURL())); base::RunLoop().RunUntilIdle(); // TODO(alecflett): Pump the message loop when this becomes async. @@ -137,11 +131,8 @@ TEST_F(ServiceWorkerDispatcherHostTest, EarlyContextDeletion) { helper_->ShutdownContext(); - bool handled; dispatcher_host->OnMessageReceived( - ServiceWorkerHostMsg_RegisterServiceWorker(-1, -1, -1, GURL(), GURL()), - &handled); - EXPECT_TRUE(handled); + ServiceWorkerHostMsg_RegisterServiceWorker(-1, -1, -1, GURL(), GURL())); // TODO(alecflett): Pump the message loop when this becomes async. ASSERT_EQ(1UL, dispatcher_host->ipc_sink()->message_count()); @@ -156,42 +147,28 @@ TEST_F(ServiceWorkerDispatcherHostTest, ProviderCreatedAndDestroyed) { const int kProviderId = 1001; // Test with a value != kRenderProcessId. - bool handled = false; dispatcher_host->OnMessageReceived( - ServiceWorkerHostMsg_ProviderCreated(kProviderId), - &handled); - EXPECT_TRUE(handled); + ServiceWorkerHostMsg_ProviderCreated(kProviderId)); EXPECT_TRUE(context()->GetProviderHost(kRenderProcessId, kProviderId)); // Two with the same ID should be seen as a bad message. - handled = false; dispatcher_host->OnMessageReceived( - ServiceWorkerHostMsg_ProviderCreated(kProviderId), - &handled); - EXPECT_TRUE(handled); + ServiceWorkerHostMsg_ProviderCreated(kProviderId)); EXPECT_EQ(1, dispatcher_host->bad_messages_received_count_); - handled = false; dispatcher_host->OnMessageReceived( - ServiceWorkerHostMsg_ProviderDestroyed(kProviderId), - &handled); - EXPECT_TRUE(handled); + ServiceWorkerHostMsg_ProviderDestroyed(kProviderId)); EXPECT_FALSE(context()->GetProviderHost(kRenderProcessId, kProviderId)); // Destroying an ID that does not exist warrants a bad message. - handled = false; dispatcher_host->OnMessageReceived( - ServiceWorkerHostMsg_ProviderDestroyed(kProviderId), - &handled); - EXPECT_TRUE(handled); + ServiceWorkerHostMsg_ProviderDestroyed(kProviderId)); EXPECT_EQ(2, dispatcher_host->bad_messages_received_count_); // Deletion of the dispatcher_host should cause providers for that // process to get deleted as well. dispatcher_host->OnMessageReceived( - ServiceWorkerHostMsg_ProviderCreated(kProviderId), - &handled); - EXPECT_TRUE(handled); + ServiceWorkerHostMsg_ProviderCreated(kProviderId)); EXPECT_TRUE(context()->GetProviderHost(kRenderProcessId, kProviderId)); EXPECT_TRUE(dispatcher_host->HasOneRef()); dispatcher_host = NULL; diff --git a/content/browser/shared_worker/shared_worker_message_filter.cc b/content/browser/shared_worker/shared_worker_message_filter.cc index 5958729..fdcf8da 100644 --- a/content/browser/shared_worker/shared_worker_message_filter.cc +++ b/content/browser/shared_worker/shared_worker_message_filter.cc @@ -41,10 +41,9 @@ void SharedWorkerMessageFilter::OnChannelClosing() { this); } -bool SharedWorkerMessageFilter::OnMessageReceived(const IPC::Message& message, - bool* message_was_ok) { +bool SharedWorkerMessageFilter::OnMessageReceived(const IPC::Message& message) { bool handled = true; - IPC_BEGIN_MESSAGE_MAP_EX(SharedWorkerMessageFilter, message, *message_was_ok) + IPC_BEGIN_MESSAGE_MAP(SharedWorkerMessageFilter, message) // Only sent from renderer for now, until we have nested workers. IPC_MESSAGE_HANDLER(ViewHostMsg_CreateWorker, OnCreateWorker) IPC_MESSAGE_HANDLER(ViewHostMsg_ForwardToWorker, OnForwardToWorker) @@ -65,7 +64,7 @@ bool SharedWorkerMessageFilter::OnMessageReceived(const IPC::Message& message, IPC_MESSAGE_HANDLER(WorkerProcessHostMsg_AllowFileSystem, OnAllowFileSystem) IPC_MESSAGE_HANDLER(WorkerProcessHostMsg_AllowIndexedDB, OnAllowIndexedDB) IPC_MESSAGE_UNHANDLED(handled = false) - IPC_END_MESSAGE_MAP_EX() + IPC_END_MESSAGE_MAP() return handled; } diff --git a/content/browser/shared_worker/shared_worker_message_filter.h b/content/browser/shared_worker/shared_worker_message_filter.h index 7ca41c2..678b186 100644 --- a/content/browser/shared_worker/shared_worker_message_filter.h +++ b/content/browser/shared_worker/shared_worker_message_filter.h @@ -27,8 +27,7 @@ class CONTENT_EXPORT SharedWorkerMessageFilter : public BrowserMessageFilter { // BrowserMessageFilter implementation. virtual void OnChannelClosing() OVERRIDE; - virtual bool OnMessageReceived(const IPC::Message& message, - bool* message_was_ok) OVERRIDE; + virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; int GetNextRoutingID(); int render_process_id() const { return render_process_id_; } diff --git a/content/browser/shared_worker/shared_worker_service_impl_unittest.cc b/content/browser/shared_worker/shared_worker_service_impl_unittest.cc index a56f6af..e08da83 100644 --- a/content/browser/shared_worker/shared_worker_service_impl_unittest.cc +++ b/content/browser/shared_worker/shared_worker_service_impl_unittest.cc @@ -187,10 +187,8 @@ class MockRendererProcessHost { bool OnMessageReceived(IPC::Message* message) { scoped_ptr<IPC::Message> msg(message); - bool message_was_ok = false; - const bool ret = - message_filter_->OnMessageReceived(*message, &message_was_ok) || - worker_filter_->OnMessageReceived(*message, &message_was_ok); + const bool ret = message_filter_->OnMessageReceived(*message) || + worker_filter_->OnMessageReceived(*message); if (message->is_sync()) { CHECK(!queued_messages_.empty()); const IPC::Message* response_msg = queued_messages_.back(); diff --git a/content/browser/speech/speech_recognition_dispatcher_host.cc b/content/browser/speech/speech_recognition_dispatcher_host.cc index 1c97a4f..7f62ae8 100644 --- a/content/browser/speech/speech_recognition_dispatcher_host.cc +++ b/content/browser/speech/speech_recognition_dispatcher_host.cc @@ -45,10 +45,9 @@ SpeechRecognitionDispatcherHost::AsWeakPtr() { } bool SpeechRecognitionDispatcherHost::OnMessageReceived( - const IPC::Message& message, bool* message_was_ok) { + const IPC::Message& message) { bool handled = true; - IPC_BEGIN_MESSAGE_MAP_EX(SpeechRecognitionDispatcherHost, message, - *message_was_ok) + IPC_BEGIN_MESSAGE_MAP(SpeechRecognitionDispatcherHost, message) IPC_MESSAGE_HANDLER(SpeechRecognitionHostMsg_StartRequest, OnStartRequest) IPC_MESSAGE_HANDLER(SpeechRecognitionHostMsg_AbortRequest, diff --git a/content/browser/speech/speech_recognition_dispatcher_host.h b/content/browser/speech/speech_recognition_dispatcher_host.h index e744471..0a76b67 100644 --- a/content/browser/speech/speech_recognition_dispatcher_host.h +++ b/content/browser/speech/speech_recognition_dispatcher_host.h @@ -53,8 +53,7 @@ class CONTENT_EXPORT SpeechRecognitionDispatcherHost float noise_volume) OVERRIDE; // BrowserMessageFilter implementation. - virtual bool OnMessageReceived(const IPC::Message& message, - bool* message_was_ok) OVERRIDE; + virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; virtual void OverrideThreadForMessage( const IPC::Message& message, BrowserThread::ID* thread) OVERRIDE; diff --git a/content/browser/tracing/trace_message_filter.cc b/content/browser/tracing/trace_message_filter.cc index bc9bac8..ba8ec65 100644 --- a/content/browser/tracing/trace_message_filter.cc +++ b/content/browser/tracing/trace_message_filter.cc @@ -34,11 +34,10 @@ void TraceMessageFilter::OnChannelClosing() { } } -bool TraceMessageFilter::OnMessageReceived(const IPC::Message& message, - bool* message_was_ok) { +bool TraceMessageFilter::OnMessageReceived(const IPC::Message& message) { // Always on IO thread (BrowserMessageFilter guarantee). bool handled = true; - IPC_BEGIN_MESSAGE_MAP_EX(TraceMessageFilter, message, *message_was_ok) + IPC_BEGIN_MESSAGE_MAP(TraceMessageFilter, message) IPC_MESSAGE_HANDLER(TracingHostMsg_ChildSupportsTracing, OnChildSupportsTracing) IPC_MESSAGE_HANDLER(TracingHostMsg_EndTracingAck, OnEndTracingAck) @@ -53,7 +52,7 @@ bool TraceMessageFilter::OnMessageReceived(const IPC::Message& message, IPC_MESSAGE_HANDLER(TracingHostMsg_TraceBufferPercentFullReply, OnTraceBufferPercentFullReply) IPC_MESSAGE_UNHANDLED(handled = false) - IPC_END_MESSAGE_MAP_EX() + IPC_END_MESSAGE_MAP() return handled; } diff --git a/content/browser/tracing/trace_message_filter.h b/content/browser/tracing/trace_message_filter.h index 0f9e18e..4233fe0 100644 --- a/content/browser/tracing/trace_message_filter.h +++ b/content/browser/tracing/trace_message_filter.h @@ -22,8 +22,7 @@ class TraceMessageFilter : public BrowserMessageFilter { // BrowserMessageFilter implementation. virtual void OnChannelClosing() OVERRIDE; - virtual bool OnMessageReceived(const IPC::Message& message, - bool* message_was_ok) OVERRIDE; + virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; void SendBeginTracing(const std::string& category_filter_str, base::debug::TraceLog::Options options); diff --git a/content/browser/vibration/vibration_message_filter.cc b/content/browser/vibration/vibration_message_filter.cc index 8f35075..fbc9041 100644 --- a/content/browser/vibration/vibration_message_filter.cc +++ b/content/browser/vibration/vibration_message_filter.cc @@ -29,16 +29,13 @@ VibrationMessageFilter::~VibrationMessageFilter() { } bool VibrationMessageFilter::OnMessageReceived( - const IPC::Message& message, - bool* message_was_ok) { + const IPC::Message& message) { bool handled = true; - IPC_BEGIN_MESSAGE_MAP_EX(VibrationMessageFilter, - message, - *message_was_ok) + IPC_BEGIN_MESSAGE_MAP(VibrationMessageFilter, message) IPC_MESSAGE_HANDLER(ViewHostMsg_Vibrate, OnVibrate) IPC_MESSAGE_HANDLER(ViewHostMsg_CancelVibration, OnCancelVibration) IPC_MESSAGE_UNHANDLED(handled = false) - IPC_END_MESSAGE_MAP_EX() + IPC_END_MESSAGE_MAP() return handled; } diff --git a/content/browser/vibration/vibration_message_filter.h b/content/browser/vibration/vibration_message_filter.h index 086cc562..1d603ee 100644 --- a/content/browser/vibration/vibration_message_filter.h +++ b/content/browser/vibration/vibration_message_filter.h @@ -19,8 +19,7 @@ class VibrationMessageFilter : public BrowserMessageFilter { private: virtual ~VibrationMessageFilter(); // BrowserMessageFilter implementation. - virtual bool OnMessageReceived(const IPC::Message& message, - bool* message_was_ok) OVERRIDE; + virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; void OnVibrate(int64 milliseconds); void OnCancelVibration(); diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc index 2acb4ed..f0812d6 100644 --- a/content/browser/web_contents/web_contents_impl.cc +++ b/content/browser/web_contents/web_contents_impl.cc @@ -493,8 +493,7 @@ bool WebContentsImpl::OnMessageReceived(RenderViewHost* render_view_host, } bool handled = true; - bool message_is_ok = true; - IPC_BEGIN_MESSAGE_MAP_EX(WebContentsImpl, message, message_is_ok) + IPC_BEGIN_MESSAGE_MAP(WebContentsImpl, message) IPC_MESSAGE_HANDLER(FrameHostMsg_PepperPluginHung, OnPepperPluginHung) IPC_MESSAGE_HANDLER(FrameHostMsg_PluginCrashed, OnPluginCrashed) IPC_MESSAGE_HANDLER(FrameHostMsg_DomOperationResponse, @@ -547,15 +546,10 @@ bool WebContentsImpl::OnMessageReceived(RenderViewHost* render_view_host, OnOpenDateTimeDialog) #endif IPC_MESSAGE_UNHANDLED(handled = false) - IPC_END_MESSAGE_MAP_EX() + IPC_END_MESSAGE_MAP() render_view_message_source_ = NULL; render_frame_message_source_ = NULL; - if (!message_is_ok) { - RecordAction(base::UserMetricsAction("BadMessageTerminate_RVD")); - GetRenderProcessHost()->ReceivedBadMessage(); - } - return handled; } diff --git a/content/browser/worker_host/worker_message_filter.cc b/content/browser/worker_host/worker_message_filter.cc index 1e515e6..62348b5 100644 --- a/content/browser/worker_host/worker_message_filter.cc +++ b/content/browser/worker_host/worker_message_filter.cc @@ -34,10 +34,9 @@ void WorkerMessageFilter::OnChannelClosing() { WorkerServiceImpl::GetInstance()->OnWorkerMessageFilterClosing(this); } -bool WorkerMessageFilter::OnMessageReceived(const IPC::Message& message, - bool* message_was_ok) { +bool WorkerMessageFilter::OnMessageReceived(const IPC::Message& message) { bool handled = true; - IPC_BEGIN_MESSAGE_MAP_EX(WorkerMessageFilter, message, *message_was_ok) + IPC_BEGIN_MESSAGE_MAP(WorkerMessageFilter, message) // Worker messages. // Only sent from renderer for now, until we have nested workers. IPC_MESSAGE_HANDLER(ViewHostMsg_CreateWorker, OnCreateWorker) @@ -45,7 +44,7 @@ bool WorkerMessageFilter::OnMessageReceived(const IPC::Message& message, // Only sent from renderer. IPC_MESSAGE_HANDLER(ViewHostMsg_DocumentDetached, OnDocumentDetached) IPC_MESSAGE_UNHANDLED(handled = false) - IPC_END_MESSAGE_MAP_EX() + IPC_END_MESSAGE_MAP() return handled; } diff --git a/content/browser/worker_host/worker_message_filter.h b/content/browser/worker_host/worker_message_filter.h index 937f67c..ab9bade 100644 --- a/content/browser/worker_host/worker_message_filter.h +++ b/content/browser/worker_host/worker_message_filter.h @@ -25,8 +25,7 @@ class WorkerMessageFilter : public BrowserMessageFilter { // BrowserMessageFilter implementation. virtual void OnChannelClosing() OVERRIDE; - virtual bool OnMessageReceived(const IPC::Message& message, - bool* message_was_ok) OVERRIDE; + virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; int GetNextRoutingID(); int render_process_id() const { return render_process_id_; } diff --git a/content/browser/worker_host/worker_process_host.cc b/content/browser/worker_host/worker_process_host.cc index f1fffed..1f9474d 100644 --- a/content/browser/worker_host/worker_process_host.cc +++ b/content/browser/worker_host/worker_process_host.cc @@ -391,7 +391,7 @@ bool WorkerProcessHost::OnMessageReceived(const IPC::Message& message) { IPC_MESSAGE_HANDLER(WorkerProcessHostMsg_ForceKillWorker, OnForceKillWorkerProcess) IPC_MESSAGE_UNHANDLED(handled = false) - IPC_END_MESSAGE_MAP_EX() + IPC_END_MESSAGE_MAP() return handled; } diff --git a/content/common/gpu/gpu_channel_manager.cc b/content/common/gpu/gpu_channel_manager.cc index 0aaf500..45298d5 100644 --- a/content/common/gpu/gpu_channel_manager.cc +++ b/content/common/gpu/gpu_channel_manager.cc @@ -102,9 +102,8 @@ GpuChannel* GpuChannelManager::LookupChannel(int32 client_id) { } bool GpuChannelManager::OnMessageReceived(const IPC::Message& msg) { - bool msg_is_ok = true; bool handled = true; - IPC_BEGIN_MESSAGE_MAP_EX(GpuChannelManager, msg, msg_is_ok) + IPC_BEGIN_MESSAGE_MAP(GpuChannelManager, msg) IPC_MESSAGE_HANDLER(GpuMsg_EstablishChannel, OnEstablishChannel) IPC_MESSAGE_HANDLER(GpuMsg_CloseChannel, OnCloseChannel) IPC_MESSAGE_HANDLER(GpuMsg_CreateViewCommandBuffer, @@ -113,7 +112,7 @@ bool GpuChannelManager::OnMessageReceived(const IPC::Message& msg) { IPC_MESSAGE_HANDLER(GpuMsg_DeleteImage, OnDeleteImage) IPC_MESSAGE_HANDLER(GpuMsg_LoadedShader, OnLoadedShader) IPC_MESSAGE_UNHANDLED(handled = false) - IPC_END_MESSAGE_MAP_EX() + IPC_END_MESSAGE_MAP() return handled; } diff --git a/content/gpu/gpu_child_thread.cc b/content/gpu/gpu_child_thread.cc index 4607c6c..74864cb 100644 --- a/content/gpu/gpu_child_thread.cc +++ b/content/gpu/gpu_child_thread.cc @@ -97,9 +97,8 @@ bool GpuChildThread::Send(IPC::Message* msg) { } bool GpuChildThread::OnControlMessageReceived(const IPC::Message& msg) { - bool msg_is_ok = true; bool handled = true; - IPC_BEGIN_MESSAGE_MAP_EX(GpuChildThread, msg, msg_is_ok) + IPC_BEGIN_MESSAGE_MAP(GpuChildThread, msg) IPC_MESSAGE_HANDLER(GpuMsg_Initialize, OnInitialize) IPC_MESSAGE_HANDLER(GpuMsg_CollectGraphicsInfo, OnCollectGraphicsInfo) IPC_MESSAGE_HANDLER(GpuMsg_GetVideoMemoryUsageStats, @@ -109,7 +108,7 @@ bool GpuChildThread::OnControlMessageReceived(const IPC::Message& msg) { IPC_MESSAGE_HANDLER(GpuMsg_Hang, OnHang) IPC_MESSAGE_HANDLER(GpuMsg_DisableWatchdog, OnDisableWatchdog) IPC_MESSAGE_UNHANDLED(handled = false) - IPC_END_MESSAGE_MAP_EX() + IPC_END_MESSAGE_MAP() if (handled) return true; diff --git a/content/public/browser/browser_message_filter.cc b/content/public/browser/browser_message_filter.cc index 452a495..377cfb7 100644 --- a/content/public/browser/browser_message_filter.cc +++ b/content/public/browser/browser_message_filter.cc @@ -11,6 +11,7 @@ #include "base/process/kill.h" #include "base/process/process_handle.h" #include "base/task_runner.h" +#include "content/browser/browser_child_process_host_impl.h" #include "content/public/browser/user_metrics.h" #include "content/public/common/content_switches.h" #include "content/public/common/result_codes.h" @@ -87,16 +88,9 @@ class BrowserMessageFilter::Internal : public IPC::MessageFilter { // Dispatches a message to the derived class. bool DispatchMessage(const IPC::Message& message) { - bool message_was_ok = true; - bool rv = filter_->OnMessageReceived(message, &message_was_ok); + bool rv = filter_->OnMessageReceived(message); DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO) || rv) << "Must handle messages that were dispatched to another thread!"; - if (!message_was_ok) { - content::RecordAction( - base::UserMetricsAction("BadMessageTerminate_BMF")); - filter_->BadMessageReceived(); - } - return rv; } @@ -206,11 +200,13 @@ bool BrowserMessageFilter::CheckCanDispatchOnUI(const IPC::Message& message, void BrowserMessageFilter::BadMessageReceived() { CommandLine* command_line = CommandLine::ForCurrentProcess(); + if (command_line->HasSwitch(switches::kDisableKillAfterBadIPC)) + return; - if (!command_line->HasSwitch(switches::kDisableKillAfterBadIPC)) { - base::KillProcess(PeerHandle(), content::RESULT_CODE_KILLED_BAD_MESSAGE, - false); - } + BrowserChildProcessHostImpl::HistogramBadMessageTerminated( + PROCESS_TYPE_RENDERER); + base::KillProcess(PeerHandle(), content::RESULT_CODE_KILLED_BAD_MESSAGE, + false); } BrowserMessageFilter::~BrowserMessageFilter() { diff --git a/content/public/browser/browser_message_filter.h b/content/public/browser/browser_message_filter.h index 3330dfe..f1334b9 100644 --- a/content/public/browser/browser_message_filter.h +++ b/content/public/browser/browser_message_filter.h @@ -75,8 +75,7 @@ class CONTENT_EXPORT BrowserMessageFilter // Your function will normally be called on the IO thread. However, if your // OverrideXForMessage modifies the thread used to dispatch the message, // your function will be called on the requested thread. - virtual bool OnMessageReceived(const IPC::Message& message, - bool* message_was_ok) = 0; + virtual bool OnMessageReceived(const IPC::Message& message) = 0; // Can be called on any thread, after OnChannelConnected is called. base::ProcessHandle PeerHandle(); diff --git a/content/public/test/mock_render_thread.cc b/content/public/test/mock_render_thread.cc index f14a557..42034e5 100644 --- a/content/public/test/mock_render_thread.cc +++ b/content/public/test/mock_render_thread.cc @@ -238,13 +238,12 @@ bool MockRenderThread::OnMessageReceived(const IPC::Message& msg) { sink_.OnMessageReceived(msg); bool handled = true; - bool msg_is_ok = true; - IPC_BEGIN_MESSAGE_MAP_EX(MockRenderThread, msg, msg_is_ok) + IPC_BEGIN_MESSAGE_MAP(MockRenderThread, msg) IPC_MESSAGE_HANDLER(ViewHostMsg_CreateWidget, OnCreateWidget) IPC_MESSAGE_HANDLER(ViewHostMsg_CreateWindow, OnCreateWindow) IPC_MESSAGE_HANDLER(FrameHostMsg_CreateChildFrame, OnCreateChildFrame) IPC_MESSAGE_UNHANDLED(handled = false) - IPC_END_MESSAGE_MAP_EX() + IPC_END_MESSAGE_MAP() return handled; } diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc index c8f5973..1dfeac6 100644 --- a/content/renderer/render_frame_impl.cc +++ b/content/renderer/render_frame_impl.cc @@ -645,8 +645,7 @@ bool RenderFrameImpl::OnMessageReceived(const IPC::Message& msg) { } bool handled = true; - bool msg_is_ok = true; - IPC_BEGIN_MESSAGE_MAP_EX(RenderFrameImpl, msg, msg_is_ok) + IPC_BEGIN_MESSAGE_MAP(RenderFrameImpl, msg) IPC_MESSAGE_HANDLER(FrameMsg_Navigate, OnNavigate) IPC_MESSAGE_HANDLER(FrameMsg_BeforeUnload, OnBeforeUnload) IPC_MESSAGE_HANDLER(FrameMsg_SwapOut, OnSwapOut) @@ -682,14 +681,7 @@ bool RenderFrameImpl::OnMessageReceived(const IPC::Message& msg) { IPC_MESSAGE_HANDLER(InputMsg_CopyToFindPboard, OnCopyToFindPboard) #endif IPC_MESSAGE_HANDLER(FrameMsg_Reload, OnReload) - IPC_END_MESSAGE_MAP_EX() - - if (!msg_is_ok) { - // The message had a handler, but its deserialization failed. - // Kill the renderer to avoid potential spoofing attacks. - int id = msg.type(); - CHECK(false) << "Unable to deserialize " << id << " in RenderFrameImpl."; - } + IPC_END_MESSAGE_MAP() return handled; } diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc index 980927b..a2be9c7 100644 --- a/content/renderer/render_view_impl.cc +++ b/content/renderer/render_view_impl.cc @@ -1055,8 +1055,7 @@ bool RenderViewImpl::OnMessageReceived(const IPC::Message& message) { return true; bool handled = true; - bool msg_is_ok = true; - IPC_BEGIN_MESSAGE_MAP_EX(RenderViewImpl, message, msg_is_ok) + IPC_BEGIN_MESSAGE_MAP(RenderViewImpl, message) IPC_MESSAGE_HANDLER(InputMsg_ExecuteEditCommand, OnExecuteEditCommand) IPC_MESSAGE_HANDLER(InputMsg_MoveCaret, OnMoveCaret) IPC_MESSAGE_HANDLER(InputMsg_ScrollFocusedEditableNodeIntoRect, @@ -1149,12 +1148,6 @@ bool RenderViewImpl::OnMessageReceived(const IPC::Message& message) { IPC_MESSAGE_UNHANDLED(handled = RenderWidget::OnMessageReceived(message)) IPC_END_MESSAGE_MAP() - if (!msg_is_ok) { - // The message had a handler, but its deserialization failed. - // Kill the renderer to avoid potential spoofing attacks. - CHECK(false) << "Unable to deserialize message in RenderViewImpl."; - } - return handled; } diff --git a/content/shell/browser/shell_message_filter.cc b/content/shell/browser/shell_message_filter.cc index d913734..b2008b3 100644 --- a/content/shell/browser/shell_message_filter.cc +++ b/content/shell/browser/shell_message_filter.cc @@ -42,10 +42,9 @@ void ShellMessageFilter::OverrideThreadForMessage(const IPC::Message& message, *thread = BrowserThread::FILE; } -bool ShellMessageFilter::OnMessageReceived(const IPC::Message& message, - bool* message_was_ok) { +bool ShellMessageFilter::OnMessageReceived(const IPC::Message& message) { bool handled = true; - IPC_BEGIN_MESSAGE_MAP_EX(ShellMessageFilter, message, *message_was_ok) + IPC_BEGIN_MESSAGE_MAP(ShellMessageFilter, message) IPC_MESSAGE_HANDLER(ShellViewHostMsg_ReadFileToString, OnReadFileToString) IPC_MESSAGE_HANDLER(ShellViewHostMsg_RegisterIsolatedFileSystem, OnRegisterIsolatedFileSystem) diff --git a/content/shell/browser/shell_message_filter.h b/content/shell/browser/shell_message_filter.h index 135a915..6b0024c 100644 --- a/content/shell/browser/shell_message_filter.h +++ b/content/shell/browser/shell_message_filter.h @@ -39,8 +39,7 @@ class ShellMessageFilter : public BrowserMessageFilter { // BrowserMessageFilter implementation. virtual void OverrideThreadForMessage(const IPC::Message& message, BrowserThread::ID* thread) OVERRIDE; - virtual bool OnMessageReceived(const IPC::Message& message, - bool* message_was_ok) OVERRIDE; + virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; void OnReadFileToString(const base::FilePath& local_file, std::string* contents); diff --git a/extensions/browser/extension_message_filter.cc b/extensions/browser/extension_message_filter.cc index 2fd31bf..3cf93f0 100644 --- a/extensions/browser/extension_message_filter.cc +++ b/extensions/browser/extension_message_filter.cc @@ -51,10 +51,9 @@ void ExtensionMessageFilter::OverrideThreadForMessage( } } -bool ExtensionMessageFilter::OnMessageReceived(const IPC::Message& message, - bool* message_was_ok) { +bool ExtensionMessageFilter::OnMessageReceived(const IPC::Message& message) { bool handled = true; - IPC_BEGIN_MESSAGE_MAP_EX(ExtensionMessageFilter, message, *message_was_ok) + IPC_BEGIN_MESSAGE_MAP(ExtensionMessageFilter, message) IPC_MESSAGE_HANDLER(ExtensionHostMsg_AddListener, OnExtensionAddListener) IPC_MESSAGE_HANDLER(ExtensionHostMsg_RemoveListener, diff --git a/extensions/browser/extension_message_filter.h b/extensions/browser/extension_message_filter.h index da2bff2..26060c5 100644 --- a/extensions/browser/extension_message_filter.h +++ b/extensions/browser/extension_message_filter.h @@ -43,8 +43,7 @@ class ExtensionMessageFilter : public content::BrowserMessageFilter { virtual void OverrideThreadForMessage( const IPC::Message& message, content::BrowserThread::ID* thread) OVERRIDE; - virtual bool OnMessageReceived(const IPC::Message& message, - bool* message_was_ok) OVERRIDE; + virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; // Message handlers on the UI thread. void OnExtensionAddListener(const std::string& extension_id, diff --git a/ipc/ipc_fuzzing_tests.cc b/ipc/ipc_fuzzing_tests.cc index 3d2d497..1ed9acd 100644 --- a/ipc/ipc_fuzzing_tests.cc +++ b/ipc/ipc_fuzzing_tests.cc @@ -345,69 +345,4 @@ TEST_F(IPCFuzzingTest, MsgBadPayloadArgs) { DestroyChannel(); } -// This class is for testing the IPC_BEGIN_MESSAGE_MAP_EX macros. -class ServerMacroExTest { - public: - ServerMacroExTest() : unhandled_msgs_(0) { - } - - virtual ~ServerMacroExTest() { - } - - virtual bool OnMessageReceived(const IPC::Message& msg) { - bool msg_is_ok = false; - IPC_BEGIN_MESSAGE_MAP_EX(ServerMacroExTest, msg, msg_is_ok) - IPC_MESSAGE_HANDLER(MsgClassIS, OnMsgClassISMessage) - IPC_MESSAGE_HANDLER(MsgClassSI, OnMsgClassSIMessage) - IPC_MESSAGE_UNHANDLED(++unhandled_msgs_) - IPC_END_MESSAGE_MAP_EX() - return msg_is_ok; - } - - int unhandled_msgs() const { - return unhandled_msgs_; - } - - private: - void OnMsgClassISMessage(int value, const std::wstring& text) { - } - void OnMsgClassSIMessage(const std::wstring& text, int value) { - } - - int unhandled_msgs_; - - DISALLOW_COPY_AND_ASSIGN(ServerMacroExTest); -}; - -TEST_F(IPCFuzzingTest, MsgMapExMacro) { - IPC::Message* msg = NULL; - ServerMacroExTest server; - - // Test the regular messages. - msg = new MsgClassIS(3, L"text3"); - EXPECT_TRUE(server.OnMessageReceived(*msg)); - delete msg; - msg = new MsgClassSI(L"text2", 2); - EXPECT_TRUE(server.OnMessageReceived(*msg)); - delete msg; - -#if defined(NDEBUG) && !defined(DCHECK_ALWAYS_ON) - // Test a bad message. - msg = new IPC::Message(MSG_ROUTING_CONTROL, MsgClassSI::ID, - IPC::Message::PRIORITY_NORMAL); - msg->WriteInt(2); - EXPECT_FALSE(server.OnMessageReceived(*msg)); - delete msg; - - msg = new IPC::Message(MSG_ROUTING_CONTROL, MsgClassIS::ID, - IPC::Message::PRIORITY_NORMAL); - msg->WriteInt(0x64); - msg->WriteInt(0x32); - EXPECT_FALSE(server.OnMessageReceived(*msg)); - delete msg; - - EXPECT_EQ(0, server.unhandled_msgs()); -#endif -} - } // namespace diff --git a/ipc/ipc_message_macros.h b/ipc/ipc_message_macros.h index 5bc1ad4..38aa740 100644 --- a/ipc/ipc_message_macros.h +++ b/ipc/ipc_message_macros.h @@ -876,40 +876,25 @@ #define IPC_MESSAGE_ID_CLASS(id) ((id) >> 16) #define IPC_MESSAGE_ID_LINE(id) ((id) & 0xffff) -// Message crackers and handlers. -// Prefer to use the IPC_BEGIN_MESSAGE_MAP_EX to the older macros since they -// allow you to detect when a message could not be de-serialized. Usage: +// Message crackers and handlers. Usage: // // bool MyClass::OnMessageReceived(const IPC::Message& msg) { // bool handled = true; -// bool msg_is_good = false; -// IPC_BEGIN_MESSAGE_MAP_EX(MyClass, msg, msg_is_good) +// IPC_BEGIN_MESSAGE_MAP(MyClass, msg) // IPC_MESSAGE_HANDLER(MsgClassOne, OnMsgClassOne) // ...more handlers here ... // IPC_MESSAGE_HANDLER(MsgClassTen, OnMsgClassTen) // IPC_MESSAGE_UNHANDLED(handled = false) -// IPC_END_MESSAGE_MAP_EX() -// if (!msg_is_good) { -// // Signal error here or terminate offending process. -// } +// IPC_END_MESSAGE_MAP() // return handled; // } -#define IPC_BEGIN_MESSAGE_MAP_EX(class_name, msg, msg_is_ok) \ - { \ - typedef class_name _IpcMessageHandlerClass; \ - void* param__ = NULL; \ - const IPC::Message& ipc_message__ = msg; \ - bool& msg_is_ok__ = msg_is_ok; \ - switch (ipc_message__.type()) { - #define IPC_BEGIN_MESSAGE_MAP(class_name, msg) \ { \ typedef class_name _IpcMessageHandlerClass; \ void* param__ = NULL; \ const IPC::Message& ipc_message__ = msg; \ - bool msg_is_ok__ = true; \ switch (ipc_message__.type()) { // gcc gives the following error now when using decltype so type typeof there: @@ -920,20 +905,18 @@ #define IPC_DECLTYPE typeof #endif -#define IPC_BEGIN_MESSAGE_MAP_WITH_PARAM(class_name, msg, msg_is_ok, param) \ +#define IPC_BEGIN_MESSAGE_MAP_WITH_PARAM(class_name, msg, param) \ { \ typedef class_name _IpcMessageHandlerClass; \ IPC_DECLTYPE(param) param__ = param; \ const IPC::Message& ipc_message__ = msg; \ - bool& msg_is_ok__ = msg_is_ok; \ switch (ipc_message__.type()) { #define IPC_MESSAGE_FORWARD(msg_class, obj, member_func) \ case msg_class::ID: { \ TRACK_RUN_IN_IPC_HANDLER(member_func); \ - msg_is_ok__ = msg_class::Dispatch(&ipc_message__, obj, this, \ - param__, &member_func); \ - if (!msg_is_ok__) \ + if (!msg_class::Dispatch(&ipc_message__, obj, this, param__, \ + &member_func)) \ ipc_message__.set_dispatch_error(); \ } \ break; @@ -944,9 +927,8 @@ #define IPC_MESSAGE_FORWARD_DELAY_REPLY(msg_class, obj, member_func) \ case msg_class::ID: { \ TRACK_RUN_IN_IPC_HANDLER(member_func); \ - msg_is_ok__ = msg_class::DispatchDelayReply(&ipc_message__, obj, \ - param__, &member_func); \ - if (!msg_is_ok__) \ + if (!msg_class::DispatchDelayReply(&ipc_message__, obj, param__, \ + &member_func)) \ ipc_message__.set_dispatch_error(); \ } \ break; @@ -984,11 +966,6 @@ #define IPC_END_MESSAGE_MAP() \ } \ - DCHECK(msg_is_ok__); \ -} - -#define IPC_END_MESSAGE_MAP_EX() \ - } \ } // This corresponds to an enum value from IPCMessageStart. diff --git a/ipc/ipc_message_unittest.cc b/ipc/ipc_message_unittest.cc index 50f4a7b..5b3a78d 100644 --- a/ipc/ipc_message_unittest.cc +++ b/ipc/ipc_message_unittest.cc @@ -88,10 +88,9 @@ class IPCMessageParameterTest : public testing::Test { IPCMessageParameterTest() : extra_param_("extra_param"), called_(false) {} bool OnMessageReceived(const IPC::Message& message) { - bool msg_is_ok = true; bool handled = true; IPC_BEGIN_MESSAGE_MAP_WITH_PARAM(IPCMessageParameterTest, message, - msg_is_ok, &extra_param_) + &extra_param_) IPC_MESSAGE_HANDLER(TestMsgClassEmpty, OnEmpty) IPC_MESSAGE_HANDLER(TestMsgClassI, OnInt) //IPC_MESSAGE_HANDLER(TestMsgClassIS, OnSync) |