summaryrefslogtreecommitdiffstats
path: root/chrome/common
diff options
context:
space:
mode:
authorjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-24 08:36:25 +0000
committerjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-24 08:36:25 +0000
commit6db8d99051f1989b4912e4eaf4c20436a1244d41 (patch)
tree9772befa98e31e5fbbc163b731fa99a0ec1a38c1 /chrome/common
parent2c9847a108f297b51f1c9823d092d7959f80bf3f (diff)
downloadchromium_src-6db8d99051f1989b4912e4eaf4c20436a1244d41.zip
chromium_src-6db8d99051f1989b4912e4eaf4c20436a1244d41.tar.gz
chromium_src-6db8d99051f1989b4912e4eaf4c20436a1244d41.tar.bz2
Revert 70144 and 70145 and add a build fix.
TBR=gfeher Review URL: http://codereview.chromium.org/5959006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@70146 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common')
-rw-r--r--chrome/common/ipc_test_sink.cc3
-rw-r--r--chrome/common/ipc_test_sink.h2
2 files changed, 3 insertions, 2 deletions
diff --git a/chrome/common/ipc_test_sink.cc b/chrome/common/ipc_test_sink.cc
index 45db8f5..69d328c 100644
--- a/chrome/common/ipc_test_sink.cc
+++ b/chrome/common/ipc_test_sink.cc
@@ -19,8 +19,9 @@ bool TestSink::Send(IPC::Message* message) {
return true;
}
-void TestSink::OnMessageReceived(const Message& msg) {
+bool 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 caf6276..05720d4 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.
- 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(); }