| Index: content/browser/renderer_host/pepper/content_browser_pepper_host_factory.h
|
| diff --git a/content/browser/renderer_host/pepper/content_browser_pepper_host_factory.h b/content/browser/renderer_host/pepper/content_browser_pepper_host_factory.h
|
| index e39ec35d858da4f1641dd68fcb2690af42515150..c0fa7aa19d98963b42686eed471a9c4ece15fc48 100644
|
| --- a/content/browser/renderer_host/pepper/content_browser_pepper_host_factory.h
|
| +++ b/content/browser/renderer_host/pepper/content_browser_pepper_host_factory.h
|
| @@ -7,9 +7,13 @@
|
|
|
| #include "base/compiler_specific.h"
|
| #include "base/memory/ref_counted.h"
|
| -#include "content/browser/renderer_host/pepper/pepper_message_filter.h"
|
| +#include "content/browser/renderer_host/pepper/ssl_context_helper.h"
|
| #include "ppapi/host/host_factory.h"
|
|
|
| +namespace net {
|
| +class StreamSocket;
|
| +}
|
| +
|
| namespace ppapi {
|
| class PpapiPermissions;
|
| }
|
| @@ -21,11 +25,8 @@ class BrowserPpapiHostImpl;
|
| class ContentBrowserPepperHostFactory : public ppapi::host::HostFactory {
|
| public:
|
| // Non-owning pointer to the filter must outlive this class.
|
| - ContentBrowserPepperHostFactory(
|
| - BrowserPpapiHostImpl* host,
|
| - // TODO (ygorshenin@): remove this once TCP sockets are
|
| - // converted to the new design.
|
| - const scoped_refptr<PepperMessageFilter>& pepper_message_filter);
|
| + ContentBrowserPepperHostFactory(BrowserPpapiHostImpl* host);
|
| +
|
| virtual ~ContentBrowserPepperHostFactory();
|
|
|
| virtual scoped_ptr<ppapi::host::ResourceHost> CreateResourceHost(
|
| @@ -34,13 +35,21 @@ class ContentBrowserPepperHostFactory : public ppapi::host::HostFactory {
|
| PP_Instance instance,
|
| const IPC::Message& message) OVERRIDE;
|
|
|
| + // Creates PepperTCPSocketMessageFilter from |socket| in already
|
| + // connected state and puts it into a list of pending resource
|
| + // hosts. In the case of success returns id of the corresponding
|
| + // pending resource host, zero otherwise.
|
| + int AddAcceptedTCPSocket(PP_Instance instance,
|
| + bool private_api,
|
| + net::StreamSocket* socket);
|
| +
|
| private:
|
| const ppapi::PpapiPermissions& GetPermissions() const;
|
|
|
| // Non-owning pointer.
|
| BrowserPpapiHostImpl* host_;
|
|
|
| - scoped_refptr<PepperMessageFilter> pepper_message_filter_;
|
| + scoped_refptr<SSLContextHelper> ssl_context_helper_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(ContentBrowserPepperHostFactory);
|
| };
|
|
|