Change how PepperMessageFilter is constructed, to simplify its use.

content/browser/renderer_host/pepper/pepper_tcp_socket.cc

 // Copyright (c) 2012 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/renderer_host/pepper/pepper_tcp_socket.h"
 
 #include <string.h>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 51 matching lines @@
       socket_(socket) {
   DCHECK(manager);
 }
 
 PepperTCPSocket::~PepperTCPSocket() {
   // Make sure no further callbacks from socket_.
   if (socket_.get())
     socket_->Disconnect();
 }
 
-void PepperTCPSocket::Connect(const std::string& host, uint16_t port) {
+void PepperTCPSocket::Connect(const std::string& host, uint16_t port,
+                              net::HostResolver* host_resolver) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
   if (connection_state_ != BEFORE_CONNECT) {
     SendConnectACKError();
     return;
   }
 
   connection_state_ = CONNECT_IN_PROGRESS;
   net::HostResolver::RequestInfo request_info(net::HostPortPair(host, port));
-  resolver_.reset(new net::SingleRequestHostResolver(
-      manager_->GetHostResolver()));
+  resolver_.reset(new net::SingleRequestHostResolver(host_resolver));
   int result = resolver_->Resolve(
       request_info, &address_list_,
       base::Bind(&PepperTCPSocket::OnResolveCompleted, base::Unretained(this)),
       net::BoundNetLog());
   if (result != net::ERR_IO_PENDING)
     OnResolveCompleted(result);
 }
 
 void PepperTCPSocket::ConnectWithNetAddress(
     const PP_NetAddress_Private& net_addr) {
@@ skipping 304 matching lines @@
   DCHECK(write_buffer_base_.get());
   DCHECK(write_buffer_.get());
   DCHECK_GT(write_buffer_->BytesRemaining(), 0);
 
   int result = socket_->Write(write_buffer_, write_buffer_->BytesRemaining(),
                               base::Bind(&PepperTCPSocket::OnWriteCompleted,
                                          base::Unretained(this)));
   if (result != net::ERR_IO_PENDING)
     OnWriteCompleted(result);
 }