Change how PepperMessageFilter is constructed, to simplify its use.

content/browser/renderer_host/pepper/pepper_tcp_socket.h

 // 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.
 
 #ifndef CONTENT_BROWSER_RENDERER_HOST_PEPPER_PEPPER_TCP_SOCKET_H_
 #define CONTENT_BROWSER_RENDERER_HOST_PEPPER_PEPPER_TCP_SOCKET_H_
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "net/base/address_list.h"
 #include "net/base/completion_callback.h"
 #include "ppapi/c/pp_stdint.h"
 
 namespace ppapi {
 class PPB_X509Certificate_Fields;
 }
 
 class PepperMessageFilter;
 struct PP_NetAddress_Private;
 
 namespace net {
 class DrainableIOBuffer;
+class HostResolver;
 class IOBuffer;
 class SingleRequestHostResolver;
 class StreamSocket;
 class X509Certificate;
 }
 
 // PepperTCPSocket is used by PepperMessageFilter to handle requests from
 // the Pepper TCP socket API (PPB_TCPSocket_Private).
 class PepperTCPSocket {
  public:
   PepperTCPSocket(PepperMessageFilter* manager,
                   int32 routing_id,
                   uint32 plugin_dispatcher_id,
                   uint32 socket_id);
 
   // Used for creation already connected sockets.  Takes ownership of
   // |socket|.
   PepperTCPSocket(PepperMessageFilter* manager,
                   int32 routing_id,
                   uint32 plugin_dispatcher_id,
                   uint32 socket_id,
                   net::StreamSocket* socket);
   ~PepperTCPSocket();
 
   int routing_id() { return routing_id_; }
 
-  void Connect(const std::string& host, uint16_t port);
+  void Connect(const std::string& host, uint16_t port,
+               net::HostResolver* host_resolver);
   void ConnectWithNetAddress(const PP_NetAddress_Private& net_addr);
   void SSLHandshake(
       const std::string& server_name,
       uint16_t server_port,
       const std::vector<std::vector<char> >& trusted_certs,
       const std::vector<std::vector<char> >& untrusted_certs);
   void Read(int32 bytes_to_read);
   void Write(const std::string& data);
 
   void SendConnectACKError();
@@ skipping 62 matching lines @@
   // rather have our |Write()| do so whenever possible. To do this, we may have
   // to call the former multiple times for each of the latter. This entails
   // using a |DrainableIOBuffer|, which requires an underlying base |IOBuffer|.
   scoped_refptr<net::IOBuffer> write_buffer_base_;
   scoped_refptr<net::DrainableIOBuffer> write_buffer_;
 
   DISALLOW_COPY_AND_ASSIGN(PepperTCPSocket);
 };
 
 #endif  // CONTENT_BROWSER_RENDERER_HOST_PEPPER_PEPPER_TCP_SOCKET_H_