Revert 70141 - Make a few more places use bool for OnMessageReceived.

TBR=brettw
Review URL: http://codereview.chromium.org/6005006

TBR=jam@chromium.org
Review URL: http://codereview.chromium.org/6094002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@70145 0039d316-1c4b-4281-b951-d872f2087c98

5 files changed, 8 insertions, 10 deletions

diff --git a/chrome/common/ipc_test_sink.cc b/chrome/common/ipc_test_sink.cc
index 69d328c..45db8f5 100644
--- a/chrome/common/ipc_test_sink.cc
+++ b/chrome/common/ipc_test_sink.cc
@@ -19,9 +19,8 @@ bool TestSink::Send(IPC::Message* message) {
   return true;
 }
 
-bool TestSink::OnMessageReceived(const Message& msg) {
+void TestSink::OnMessageReceived(const Message& msg) {
   messages_.push_back(Message(msg));
-  return true;
 }
 
 void TestSink::ClearMessages() {
diff --git a/chrome/common/ipc_test_sink.h b/chrome/common/ipc_test_sink.h
index 05720d4..caf6276 100644
--- a/chrome/common/ipc_test_sink.h
+++ b/chrome/common/ipc_test_sink.h
@@ -54,7 +54,7 @@ class TestSink : public IPC::Channel {
 
   // Used by the source of the messages to send the message to the sink. This
   // will make a copy of the message and store it in the list.
-  bool OnMessageReceived(const Message& msg);
+  void OnMessageReceived(const Message& msg);
 
   // Returns the number of messages in the queue.
   size_t message_count() const { return messages_.size(); }
diff --git a/chrome/test/automation/tab_proxy.h b/chrome/test/automation/tab_proxy.h
index 7c02805..82f65ac 100644
--- a/chrome/test/automation/tab_proxy.h
+++ b/chrome/test/automation/tab_proxy.h
@@ -48,7 +48,7 @@ class TabProxy : public AutomationResourceProxy,
  public:
   class TabProxyDelegate {
    public:
-    virtual bool OnMessageReceived(TabProxy* tab, const IPC::Message& msg) {}
+    virtual void OnMessageReceived(TabProxy* tab, const IPC::Message& msg) {}
     virtual void OnChannelError(TabProxy* tab) {}
 
    protected:
diff --git a/chrome_frame/chrome_frame_automation.cc b/chrome_frame/chrome_frame_automation.cc
index 887e545..a026669 100644
--- a/chrome_frame/chrome_frame_automation.cc
+++ b/chrome_frame/chrome_frame_automation.cc
@@ -1168,20 +1168,19 @@ bool ChromeFrameAutomationClient::ProcessUrlRequestMessage(TabProxy* tab,
 // kind of beings.
 // By default we marshal the IPC message to the main/GUI thread and from there
 // we safely invoke chrome_frame_delegate_->OnMessageReceived(msg).
-bool ChromeFrameAutomationClient::OnMessageReceived(TabProxy* tab,
+void ChromeFrameAutomationClient::OnMessageReceived(TabProxy* tab,
                                                     const IPC::Message& msg) {
   DCHECK(tab == tab_.get());
   // Quickly process network related messages.
   if (url_fetcher_ && ProcessUrlRequestMessage(tab, msg, false))
-    return true;
+    return;
 
   // Early check to avoid needless marshaling
   if (chrome_frame_delegate_ == NULL)
-    return false;
+    return;
 
   PostTask(FROM_HERE, NewRunnableMethod(this,
       &ChromeFrameAutomationClient::OnMessageReceivedUIThread, msg));
-  return true;
 }
 
 void ChromeFrameAutomationClient::OnChannelError(TabProxy* tab) {
diff --git a/chrome_frame/chrome_frame_automation.h b/chrome_frame/chrome_frame_automation.h
index b4dbea2..7432ee2 100644
--- a/chrome_frame/chrome_frame_automation.h
+++ b/chrome_frame/chrome_frame_automation.h
@@ -459,7 +459,7 @@ class ChromeFrameAutomationClient
   virtual void AutomationServerDied();
 
   // TabProxyDelegate implementation
-  virtual bool OnMessageReceived(TabProxy* tab, const IPC::Message& msg);
+  virtual void OnMessageReceived(TabProxy* tab, const IPC::Message& msg);
   virtual void OnChannelError(TabProxy* tab);
 
   void CreateExternalTab();
@@ -480,7 +480,7 @@ class ChromeFrameAutomationClient
   }
 
  private:
-  bool OnMessageReceivedUIThread(const IPC::Message& msg);
+  void OnMessageReceivedUIThread(const IPC::Message& msg);
   void OnChannelErrorUIThread();
 
   HWND chrome_window() const { return chrome_window_; }