diff options
| author | ygorshenin@chromium.org <ygorshenin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-28 19:42:59 +0000 |
|---|---|---|
| committer | ygorshenin@chromium.org <ygorshenin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-28 19:42:59 +0000 |
| commit | 8522332eef21df16cac696d7725f4b5eeebc3be6 (patch) | |
| tree | 8a2704f6dd82e0a8ef9ed247766cdb63a7728e1e /ppapi/proxy/host_resolver_resource_base.cc | |
| parent | a23bccf2686126046ec29b7cbe69b0b9c809a153 (diff) | |
| download | chromium_src-8522332eef21df16cac696d7725f4b5eeebc3be6.zip chromium_src-8522332eef21df16cac696d7725f4b5eeebc3be6.tar.gz chromium_src-8522332eef21df16cac696d7725f4b5eeebc3be6.tar.bz2 | |
TCPSockets are switched to the new Pepper proxy.
BUG=230784
TEST=browser_tests:*TCPSocket*, *TCPServerSocket*
Review URL: https://chromiumcodereview.appspot.com/22923014
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@220073 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi/proxy/host_resolver_resource_base.cc')
| -rw-r--r-- | ppapi/proxy/host_resolver_resource_base.cc | 23 |
1 files changed, 3 insertions, 20 deletions
diff --git a/ppapi/proxy/host_resolver_resource_base.cc b/ppapi/proxy/host_resolver_resource_base.cc index 5cbbbb2..d552b76 100644 --- a/ppapi/proxy/host_resolver_resource_base.cc +++ b/ppapi/proxy/host_resolver_resource_base.cc @@ -6,6 +6,7 @@ #include "base/bind.h" #include "ppapi/c/pp_errors.h" +#include "ppapi/proxy/error_conversion.h" #include "ppapi/proxy/net_address_resource.h" #include "ppapi/proxy/ppapi_messages.h" #include "ppapi/shared_impl/tracked_callback.h" @@ -14,25 +15,6 @@ namespace ppapi { namespace proxy { -namespace { - -int32_t ConvertPPError(int32_t pp_error, bool private_api) { - // The private API doesn't return network-specific error codes or - // PP_ERROR_NOACCESS. In order to preserve the behavior, we convert those to - // PP_ERROR_FAILED. - // TODO(yzshen): Consider defining ranges for different kinds of PP_Error - // codes, so that we can detect network-specific error codes in a better way. - if (private_api && - (pp_error <= PP_ERROR_CONNECTION_CLOSED || - pp_error == PP_ERROR_NOACCESS)) { - return PP_ERROR_FAILED; - } - - return pp_error; -} - -} // namespace - HostResolverResourceBase::HostResolverResourceBase(Connection connection, PP_Instance instance, bool private_api) @@ -110,7 +92,8 @@ void HostResolverResourceBase::OnPluginMsgResolveReply( canonical_name_.clear(); net_address_list_.clear(); } - resolve_callback_->Run(ConvertPPError(params.result(), private_api_)); + resolve_callback_->Run(ConvertNetworkAPIErrorForCompatibility(params.result(), + private_api_)); } void HostResolverResourceBase::SendResolve( |