Make BrowserMessageFilter not derive from IPC::ChannelProxy::MessageFilter. This allows us to hide …

content/browser/resolve_proxy_msg_helper_unittest.cc

 // Copyright (c) 2011 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.
 
 #include "content/browser/resolve_proxy_msg_helper.h"
 
 #include "content/browser/browser_thread_impl.h"
 #include "content/common/view_messages.h"
 #include "ipc/ipc_test_sink.h"
 #include "net/base/net_errors.h"
 #include "net/proxy/mock_proxy_resolver.h"
 #include "net/proxy/proxy_config_service.h"
 #include "net/proxy/proxy_service.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace content {
 
 // This ProxyConfigService always returns "http://pac" as the PAC url to use.
 class MockProxyConfigService : public net::ProxyConfigService {
  public:
   virtual void AddObserver(Observer* observer) OVERRIDE {}
   virtual void RemoveObserver(Observer* observer) OVERRIDE {}
   virtual ConfigAvailability GetLatestProxyConfig(
       net::ProxyConfig* results) OVERRIDE {
     *results = net::ProxyConfig::CreateFromCustomPacURL(GURL("http://pac"));
     return CONFIG_VALID;
   }
 };
 
+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;
+  }
+
+ private:
+  IPC::Listener* listener_;
+};
+
 class ResolveProxyMsgHelperTest : public testing::Test, public IPC::Listener {
  public:
   struct PendingResult {
     PendingResult(bool result,
                   const std::string& proxy_list)
         : result(result), proxy_list(proxy_list) {
     }
 
     bool result;
     std::string proxy_list;
   };
 
   ResolveProxyMsgHelperTest()
       : 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:
   const PendingResult* pending_result() const { return pending_result_.get(); }
 
   void clear_pending_result() {
     pending_result_.reset();
   }
 
   IPC::Message* GenerateReply() {
@@ skipping 169 matching lines @@
 
   EXPECT_EQ(0u, resolver_->pending_requests().size());
 
   EXPECT_TRUE(pending_result() == NULL);
 
   // It should also be the case that msg1, msg2, msg3 were deleted by the
   // cancellation. (Else will show up as a leak in Valgrind).
 }
 
 }  // namespace content