Revert 70144 and 70145 and add a build fix.

chrome/common/ipc_test_sink.h

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_COMMON_IPC_TEST_SINK_H_
 #define CHROME_COMMON_IPC_TEST_SINK_H_
 #pragma once
 
 #include <utility>
 #include <vector>
@@ skipping 36 matching lines @@
  public:
   TestSink();
   ~TestSink();
 
   // Interface in IPC::Channel. This copies the message to the sink and then
   // deletes it.
   virtual bool Send(IPC::Message* message);
 
   // 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.
-  void OnMessageReceived(const Message& msg);
+  bool OnMessageReceived(const Message& msg);
 
   // Returns the number of messages in the queue.
   size_t message_count() const { return messages_.size(); }
 
   // Clears the message queue of saved messages.
   void ClearMessages();
 
   // Returns the message at the given index in the queue. The index may be out
   // of range, in which case the return value is NULL. The returned pointer will
   // only be valid until another message is received or the list is cleared.
@@ skipping 14 matching lines @@
  private:
   // The actual list of received messages.
   std::vector<Message> messages_;
 
   DISALLOW_COPY_AND_ASSIGN(TestSink);
 };
 
 }  // namespace IPC
 
 #endif  // CHROME_COMMON_IPC_TEST_SINK_H_