Implement PPB_HostResolver_Dev: part 2

ppapi/proxy/host_resolver_resource_base.cc

 // Copyright 2013 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.
 
 #include "ppapi/proxy/host_resolver_resource_base.h"
 
 #include "ppapi/c/pp_errors.h"
 #include "ppapi/proxy/net_address_resource.h"
 #include "ppapi/proxy/ppapi_messages.h"
 #include "ppapi/shared_impl/tracked_callback.h"
 #include "ppapi/shared_impl/var.h"
 
 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 havavior, we convert those to
+  // PP_ERROR_FAILED.
+  if (private_api &&
+      (pp_error <= PP_ERROR_CONNECTION_CLOSED ||

[raymes, 2013/06/18 18:21:17]

nit: It would sort of be nicer to check whether this was in a range of errors
rather than below a certain error. Do we have a predefined range for net errors?
A utility function IsNetError would be even nicer.

[yzshen1, 2013/06/18 19:08:43]

I agree with you that the current code doesn't look nice.

I am not quite sure how to define the ranges without starting a discussion in
the pepper group. If you are okay, I will add a TODO around here and do it
later.

Thanks!

On 2013/06/18 18:21:17, raymes wrote:

+       pp_error == PP_ERROR_NOACCESS)) {
+    return PP_ERROR_FAILED;
+  }
+
+  return pp_error;
+}
+
+}  // namespace
+
 HostResolverResourceBase::HostResolverResourceBase(Connection connection,
-                                                   PP_Instance instance)
+                                                   PP_Instance instance,
+                                                   bool private_api)
     : PluginResource(connection, instance),
+      private_api_(private_api),
       allow_get_results_(false) {
-  SendCreate(BROWSER, PpapiHostMsg_HostResolverPrivate_Create());
+  if (private_api)
+    SendCreate(BROWSER, PpapiHostMsg_HostResolver_CreatePrivate());
+  else
+    SendCreate(BROWSER, PpapiHostMsg_HostResolver_Create());
 }
 
 HostResolverResourceBase::~HostResolverResourceBase() {
 }
 
 int32_t HostResolverResourceBase::ResolveImpl(
     const char* host,
     uint16_t port,
     const PP_HostResolver_Private_Hint* hint,
     scoped_refptr<TrackedCallback> callback) {
@@ skipping 47 matching lines @@
              net_address_list.begin();
          iter != net_address_list.end();
          ++iter) {
       net_address_list_.push_back(
           new NetAddressResource(connection(), pp_instance(), *iter));
     }
   } else {
     canonical_name_.clear();
     net_address_list_.clear();
   }
-  resolve_callback_->Run(params.result());
+  resolve_callback_->Run(ConvertPPError(params.result(), private_api_));
 }
 
 void HostResolverResourceBase::SendResolve(
     const HostPortPair& host_port,
     const PP_HostResolver_Private_Hint* hint) {
-  PpapiHostMsg_HostResolverPrivate_Resolve msg(host_port, *hint);
-  Call<PpapiPluginMsg_HostResolverPrivate_ResolveReply>(
+  PpapiHostMsg_HostResolver_Resolve msg(host_port, *hint);
+  Call<PpapiPluginMsg_HostResolver_ResolveReply>(
       BROWSER,
       msg,
       base::Bind(&HostResolverResourceBase::OnPluginMsgResolveReply,
                  base::Unretained(this)));
 }
 
 bool HostResolverResourceBase::ResolveInProgress() const {
   return TrackedCallback::IsPending(resolve_callback_);
 }
 
 }  // namespace proxy
 }  // namespace ppapi