TCPSockets are switched to the new Pepper proxy.

content/browser/renderer_host/pepper/pepper_message_filter.h

Index: content/browser/renderer_host/pepper/pepper_message_filter.h
diff --git a/content/browser/renderer_host/pepper/pepper_message_filter.h b/content/browser/renderer_host/pepper/pepper_message_filter.h
index 11c8fbd4902db1324fb413bad911f7ff1cb314da..7dedb9eb1dc284494a8647584ddffdc114be63f7 100644
--- a/content/browser/renderer_host/pepper/pepper_message_filter.h
+++ b/content/browser/renderer_host/pepper/pepper_message_filter.h
@@ -5,51 +5,24 @@
 #ifndef CONTENT_BROWSER_RENDERER_HOST_PEPPER_PEPPER_MESSAGE_FILTER_H_
 #define CONTENT_BROWSER_RENDERER_HOST_PEPPER_PEPPER_MESSAGE_FILTER_H_
 
-#include <map>
-#include <string>
+#include <set>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/files/file_path.h"
-#include "base/memory/linked_ptr.h"
 #include "base/memory/scoped_ptr.h"
-#include "base/process/process.h"
 #include "content/public/browser/browser_message_filter.h"
-#include "content/public/browser/content_browser_client.h"
-#include "content/public/common/process_type.h"
 #include "net/base/net_util.h"
 #include "net/base/network_change_notifier.h"
-#include "net/http/transport_security_state.h"
-#include "net/socket/stream_socket.h"
-#include "net/ssl/ssl_config_service.h"
-#include "ppapi/c/pp_resource.h"
-#include "ppapi/c/pp_stdint.h"
-#include "ppapi/c/ppb_tcp_socket.h"
-#include "ppapi/c/private/ppb_flash.h"
-#include "ppapi/host/ppapi_host.h"
 #include "ppapi/shared_impl/ppapi_permissions.h"
 
-struct PP_NetAddress_Private;
-
-namespace base {
-class ListValue;
-}
-
-namespace net {
-class CertVerifier;
-class HostResolver;
-}
-
 namespace ppapi {
 class PPB_X509Certificate_Fields;
-class SocketOptionData;
 }
 
 namespace content {
 class BrowserContext;
-class PepperTCPSocket;
-class ResourceContext;
 
 // This class is used in two contexts, both supporting PPAPI plugins. The first
 // is on the renderer->browser channel, to handle requests from in-process
@@ -60,20 +33,18 @@ class PepperMessageFilter
     : public BrowserMessageFilter,
       public net::NetworkChangeNotifier::IPAddressObserver {
  public:
-  // Constructor when used in the context of a render process.
-  PepperMessageFilter(int process_id,
-                      BrowserContext* browser_context);
+  // Factory method used in the context of a render process.
+  static PepperMessageFilter* CreateInProcess(BrowserContext* browser_context);

[yzshen1, 2013/08/16 20:40:42]

How about the following names?
CreateForRendererProcess
CreateForPpapiPluginProcess
CreateForExternalPluginProcess

[ygorshenin1, 2013/08/19 14:33:35]

Done.

 
-  // Constructor when used in the context of a PPAPI process..
-  PepperMessageFilter(const ppapi::PpapiPermissions& permissions,
-                      net::HostResolver* host_resolver);
+  // Factory method used in the context of a PPAPI process.
+  static PepperMessageFilter* CreateOutOfProcess(
+      const ppapi::PpapiPermissions& permissions);
 
-  // Constructor when used in the context of an external plugin, i.e. created by
-  // the embedder using BrowserPpapiHost::CreateExternalPluginProcess.
-  PepperMessageFilter(const ppapi::PpapiPermissions& permissions,
-                      net::HostResolver* host_resolver,
-                      int process_id,
-                      int render_view_id);
+  // Factory method used in the context of an external plugin,
+  // i.e. created by the embedder using
+  // BrowserPpapiHost::CreateExternalPluginProcess.
+  static PepperMessageFilter* CreateExternal(
+      const ppapi::PpapiPermissions& permissions);
 
   // BrowserMessageFilter methods.
   virtual bool OnMessageReceived(const IPC::Message& message,
@@ -82,105 +53,36 @@ class PepperMessageFilter
   // net::NetworkChangeNotifier::IPAddressObserver interface.
   virtual void OnIPAddressChanged() OVERRIDE;
 
-  // Returns the host resolver (it may come from the resource context or the
-  // host_resolver_ member).
-  net::HostResolver* GetHostResolver();
-
-  net::CertVerifier* GetCertVerifier();
-  net::TransportSecurityState* GetTransportSecurityState();
-
-  // Adds already accepted socket to the internal TCP sockets table. Takes
-  // ownership over |socket|. In the case of failure (full socket table)
-  // returns 0 and deletes |socket|. Otherwise, returns generated ID for
-  // |socket|.
-  uint32 AddAcceptedTCPSocket(int32 routing_id,
-                              uint32 plugin_dispatcher_id,
-                              net::StreamSocket* socket);
-
-  const net::SSLConfig& ssl_config() { return ssl_config_; }
-
  protected:
   virtual ~PepperMessageFilter();
 
  private:
-  struct OnConnectTcpBoundInfo {
-    int routing_id;
-    int request_id;
-  };
-
-  // Containers for sockets keyed by socked_id.
-  typedef std::map<uint32, linked_ptr<PepperTCPSocket> > TCPSocketMap;
-
   // Set of disptachers ID's that have subscribed for NetworkMonitor
   // notifications.
   typedef std::set<uint32> NetworkMonitorIdSet;
 
-  void OnGetLocalTimeZoneOffset(base::Time t, double* result);
-
-  void OnTCPCreate(int32 routing_id,
-                   uint32 plugin_dispatcher_id,
-                   uint32* socket_id);
-  void OnTCPCreatePrivate(int32 routing_id,
-                          uint32 plugin_dispatcher_id,
-                          uint32* socket_id);
-  void OnTCPConnect(int32 routing_id,
-                    uint32 socket_id,
-                    const std::string& host,
-                    uint16_t port);
-  void OnTCPConnectWithNetAddress(int32 routing_id,
-                                  uint32 socket_id,
-                                  const PP_NetAddress_Private& net_addr);
-  void OnTCPSSLHandshake(
-      uint32 socket_id,
-      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 OnTCPRead(uint32 socket_id, int32_t bytes_to_read);
-  void OnTCPWrite(uint32 socket_id, const std::string& data);
-  void OnTCPDisconnect(uint32 socket_id);
-  void OnTCPSetOption(uint32 socket_id,
-                      PP_TCPSocket_Option name,
-                      const ppapi::SocketOptionData& value);
+  enum PluginType {
+    PLUGIN_TYPE_IN_PROCESS,
+    PLUGIN_TYPE_OUT_OF_PROCESS,
+    // External plugin means it was created through
+    // BrowserPpapiHost::CreateExternalPluginProcess.
+    PLUGIN_TYPE_EXTERNAL_PLUGIN,
+  };
+
+  PepperMessageFilter(BrowserContext* browser_context,
+                      const ppapi::PpapiPermissions& permissions,
+                      PluginType plugin_type);
 
   void OnNetworkMonitorStart(uint32 plugin_dispatcher_id);
   void OnNetworkMonitorStop(uint32 plugin_dispatcher_id);
 
-  void DoTCPConnect(int32 routing_id,
-                    uint32 socket_id,
-                    const std::string& host,
-                    uint16_t port,
-                    bool allowed);
-  void DoTCPConnectWithNetAddress(int32 routing_id,
-                                  uint32 socket_id,
-                                  const PP_NetAddress_Private& net_addr,
-                                  bool allowed);
   void OnX509CertificateParseDER(const std::vector<char>& der,
                                  bool* succeeded,
                                  ppapi::PPB_X509Certificate_Fields* result);
-  void OnUpdateActivity();
-
-  uint32 GenerateSocketID();
-
-  // Return true if render with given ID can use socket APIs.
-  bool CanUseSocketAPIs(int32 render_id,
-                        const content::SocketPermissionRequest& params,
-                        bool private_api);
 
   void GetAndSendNetworkList();
   void DoGetNetworkList();
   void SendNetworkList(scoped_ptr<net::NetworkInterfaceList> list);
-  void CreateTCPSocket(int32 routing_id,
-                       uint32 plugin_dispatcher_id,
-                       bool private_api,
-                       uint32* socket_id);
-  enum PluginType {
-    PLUGIN_TYPE_IN_PROCESS,
-    PLUGIN_TYPE_OUT_OF_PROCESS,
-    // External plugin means it was created through
-    // BrowserPpapiHost::CreateExternalPluginProcess.
-    PLUGIN_TYPE_EXTERNAL_PLUGIN,
-  };
 
   PluginType plugin_type_;
 
@@ -190,38 +92,9 @@ class PepperMessageFilter
   // be many plugins sharing this channel).
   ppapi::PpapiPermissions permissions_;
 
-  // Render process ID.
-  int process_id_;
-
-  // External plugin RenderView id to determine private API access. Normally, we
-  // handle messages coming from multiple RenderViews, but external plugins
-  // always creates a new PepperMessageFilter for each RenderView.
-  int external_plugin_render_view_id_;
-
-  // When non-NULL, this should be used instead of the host_resolver_.
-  ResourceContext* const resource_context_;
-
-  // When non-NULL, this should be used instead of the resource_context_. Use
-  // GetHostResolver instead of accessing directly.
-  net::HostResolver* host_resolver_;
-
-  // The default SSL configuration settings are used, as opposed to Chrome's SSL
-  // settings.
-  net::SSLConfig ssl_config_;
-  // This is lazily created. Users should use GetCertVerifier to retrieve it.
-  scoped_ptr<net::CertVerifier> cert_verifier_;
-  // This is lazily created. Users should use GetTransportSecurityState to
-  // retrieve it.
-  scoped_ptr<net::TransportSecurityState> transport_security_state_;
-
-  uint32 next_socket_id_;
-
-  TCPSocketMap tcp_sockets_;
-
   NetworkMonitorIdSet network_monitor_ids_;
 
   base::FilePath browser_path_;
-  bool incognito_;
 
   DISALLOW_COPY_AND_ASSIGN(PepperMessageFilter);
 };