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 977ca3bf5d5f1d1a39174a22bd8e2bc009c95881..023cdd31c7a396b17157b8100489a11735bc177f 100644 |
--- a/content/browser/renderer_host/pepper/pepper_message_filter.h |
+++ b/content/browser/renderer_host/pepper/pepper_message_filter.h |
@@ -10,12 +10,14 @@ |
#include <vector> |
#include "base/basictypes.h" |
+#include "base/compiler_specific.h" |
#include "base/file_path.h" |
#include "base/memory/linked_ptr.h" |
#include "base/memory/scoped_ptr.h" |
#include "base/process.h" |
#include "content/public/browser/browser_message_filter.h" |
#include "content/public/browser/content_browser_client.h" |
+#include "net/base/host_resolver.h" |
yzshen1
2012/12/20 20:00:20
nit: you could use a forward declaration, because
ygorshenin1
2012/12/21 12:53:26
Done.
|
#include "net/base/net_util.h" |
#include "net/base/network_change_notifier.h" |
#include "net/base/ssl_config_service.h" |
@@ -27,21 +29,15 @@ |
#include "ppapi/host/ppapi_host.h" |
#include "ppapi/shared_impl/ppapi_permissions.h" |
-struct PP_HostResolver_Private_Hint; |
-struct PP_NetAddress_Private; |
yzshen1
2012/12/20 20:00:20
nit: it seems okay to keep this forward declaratio
ygorshenin1
2012/12/21 12:53:26
Done.
|
- |
namespace base { |
class ListValue; |
} |
namespace net { |
-class AddressList; |
class CertVerifier; |
-class HostResolver; |
} |
namespace ppapi { |
-struct HostPortPair; |
class PPB_X509Certificate_Fields; |
} |
@@ -119,12 +115,6 @@ class PepperMessageFilter |
int request_id; |
}; |
- struct OnHostResolverResolveBoundInfo { |
- int32 routing_id; |
- uint32 plugin_dispatcher_id; |
- uint32 host_resolver_id; |
- }; |
- |
// Containers for sockets keyed by socked_id. |
typedef std::map<uint32, linked_ptr<PepperTCPSocket> > TCPSocketMap; |
typedef std::map<uint32, linked_ptr<PepperUDPSocket> > UDPSocketMap; |
@@ -182,20 +172,6 @@ class PepperMessageFilter |
void OnTCPServerAccept(int32 tcp_client_socket_routing_id, |
uint32 server_socket_id); |
- void OnHostResolverResolve(int32 routing_id, |
- uint32 plugin_dispatcher_id, |
- uint32 host_resolver_id, |
- const ppapi::HostPortPair& host_port, |
- const PP_HostResolver_Private_Hint& hint); |
- // Continuation of |OnHostResolverResolve()|. |
- void OnHostResolverResolveLookupFinished( |
- int result, |
- const net::AddressList& addresses, |
- const OnHostResolverResolveBoundInfo& bound_info); |
- bool SendHostResolverResolveACKError(int32 routing_id, |
- uint32 plugin_dispatcher_id, |
- uint32 host_resolver_id); |
- |
void OnNetworkMonitorStart(uint32 plugin_dispatcher_id); |
void OnNetworkMonitorStop(uint32 plugin_dispatcher_id); |
@@ -223,12 +199,6 @@ class PepperMessageFilter |
PP_Resource socket_resource, |
const PP_NetAddress_Private& addr, |
int32_t backlog); |
- void DoHostResolverResolve(int32 routing_id, |
- uint32 plugin_dispatcher_id, |
- uint32 host_resolver_id, |
- const ppapi::HostPortPair& host_port, |
- const PP_HostResolver_Private_Hint& hint); |
- |
void OnX509CertificateParseDER(const std::vector<char>& der, |
bool* succeeded, |
ppapi::PPB_X509Certificate_Fields* result); |