Make BrowserMessageFilter not derive from IPC::ChannelProxy::MessageFilter. This allows us to hide the OnMessageReceived which shouldn't be overridden from child classes, and also avoid the pattern of requiring an overridden method to have to call to the base class.

R=scherkus@chromium.org, scherkus

Review URL: https://codereview.chromium.org/24514003

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

1 files changed, 20 insertions, 2 deletions

diff --git a/content/browser/resolve_proxy_msg_helper_unittest.cc b/content/browser/resolve_proxy_msg_helper_unittest.cc
index 628df86..91f0243 100644
--- a/content/browser/resolve_proxy_msg_helper_unittest.cc
+++ b/content/browser/resolve_proxy_msg_helper_unittest.cc
@@ -27,6 +27,25 @@ class MockProxyConfigService : public net::ProxyConfigService {
   }
 };
 
+class TestResolveProxyMsgHelper : public ResolveProxyMsgHelper {
+ public:
+  TestResolveProxyMsgHelper(
+      net::ProxyService* proxy_service,
+      IPC::Listener* listener)
+      : ResolveProxyMsgHelper(proxy_service),
+        listener_(listener) {}
+  virtual bool Send(IPC::Message* message) OVERRIDE {
+    listener_->OnMessageReceived(*message);
+    delete message;
+    return true;
+  }
+
+ protected:
+  virtual ~TestResolveProxyMsgHelper() {}
+
+  IPC::Listener* listener_;
+};
+
 class ResolveProxyMsgHelperTest : public testing::Test, public IPC::Listener {
  public:
   struct PendingResult {
@@ -43,11 +62,10 @@ class ResolveProxyMsgHelperTest : public testing::Test, public IPC::Listener {
       : resolver_(new net::MockAsyncProxyResolver),
         service_(
             new net::ProxyService(new MockProxyConfigService, resolver_, NULL)),
-        helper_(new ResolveProxyMsgHelper(service_.get())),
+        helper_(new TestResolveProxyMsgHelper(service_.get(), this)),
         message_loop_(base::MessageLoop::TYPE_IO),
         io_thread_(BrowserThread::IO, &message_loop_) {
     test_sink_.AddFilter(this);
-    helper_->OnFilterAdded(&test_sink_);
   }
 
  protected: