diff options
| author | dmazzoni@chromium.org <dmazzoni@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-12 19:35:35 +0000 |
|---|---|---|
| committer | dmazzoni@chromium.org <dmazzoni@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-12 19:35:35 +0000 |
| commit | a576851e5e00f1d8ef88ef20396a487cc2c027d4 (patch) | |
| tree | 6b742d12e49603b36e7d4079ed0a8534919621aa /ipc | |
| parent | ef0eb3230ac3f8915a98bb80724df85655d0dbc1 (diff) | |
| download | chromium_src-a576851e5e00f1d8ef88ef20396a487cc2c027d4.zip chromium_src-a576851e5e00f1d8ef88ef20396a487cc2c027d4.tar.gz chromium_src-a576851e5e00f1d8ef88ef20396a487cc2c027d4.tar.bz2 | |
Revert 193974 "Test extension reloading behavior."
ExtensionServiceTest.ReloadExtension failed on Linux.
> Test extension reloading behavior.
>
> By testing the actual interaction with renderer processes and the
> notification system, I can expose the fact that we're starting a whole
> extra process and loading the extension around 3 times.
>
>
> BUG=178542
>
> Review URL: https://chromiumcodereview.appspot.com/13533007
TBR=jyasskin@chromium.org
Review URL: https://codereview.chromium.org/13844013
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@193986 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ipc')
| -rw-r--r-- | ipc/ipc_test_sink.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/ipc/ipc_test_sink.h b/ipc/ipc_test_sink.h index 7a39f38..78be9e7 100644 --- a/ipc/ipc_test_sink.h +++ b/ipc/ipc_test_sink.h @@ -11,7 +11,6 @@ #include "base/basictypes.h" #include "base/observer_list.h" #include "ipc/ipc_channel.h" -#include "ipc/ipc_listener.h" namespace IPC { @@ -71,7 +70,7 @@ class Message; // // To hook up the sink, all you need to do is call OnMessageReceived when a // message is received. -class TestSink : public Channel, public Listener { +class TestSink : public Channel { public: TestSink(); virtual ~TestSink(); @@ -82,7 +81,7 @@ class TestSink : public Channel, public Listener { // 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. - virtual bool OnMessageReceived(const Message& msg) OVERRIDE; + bool OnMessageReceived(const Message& msg); // Returns the number of messages in the queue. size_t message_count() const { return messages_.size(); } |