Move PPB_HostResolver out of dev.

BUG=247225
TEST=None

Review URL: https://chromiumcodereview.appspot.com/17291015

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@208147 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 15 insertions, 16 deletions

diff --git a/ppapi/thunk/interfaces_ppb_public_dev.h b/ppapi/thunk/interfaces_ppb_public_dev.h
index d440dfb..23a6039 100644
--- a/ppapi/thunk/interfaces_ppb_public_dev.h
+++ b/ppapi/thunk/interfaces_ppb_public_dev.h
@@ -23,8 +23,6 @@ PROXIED_IFACE(NoAPIName, PPB_FILECHOOSER_DEV_INTERFACE_0_5,
 PROXIED_IFACE(NoAPIName, PPB_FILECHOOSER_DEV_INTERFACE_0_6,
               PPB_FileChooser_Dev_0_6)
 UNPROXIED_IFACE(PPB_Find, PPB_FIND_DEV_INTERFACE_0_3, PPB_Find_Dev_0_3)
-PROXIED_IFACE(NoAPIName, PPB_HOSTRESOLVER_DEV_INTERFACE_0_1,
-              PPB_HostResolver_Dev_0_1)
 PROXIED_IFACE(NoAPIName, PPB_IME_INPUT_EVENT_DEV_INTERFACE_0_2,
               PPB_IMEInputEvent_Dev_0_2)
 PROXIED_IFACE(NoAPIName, PPB_KEYBOARD_INPUT_EVENT_DEV_INTERFACE_0_1,
diff --git a/ppapi/thunk/interfaces_ppb_public_stable.h b/ppapi/thunk/interfaces_ppb_public_stable.h
index f7159c7..84d7688 100644
--- a/ppapi/thunk/interfaces_ppb_public_stable.h
+++ b/ppapi/thunk/interfaces_ppb_public_stable.h
@@ -58,6 +58,7 @@ PROXIED_IFACE(NoAPIName, PPB_FILEIO_INTERFACE_1_0, PPB_FileIO_1_0)
 PROXIED_IFACE(NoAPIName, PPB_FILEIO_INTERFACE_1_1, PPB_FileIO_1_1)
 PROXIED_IFACE(NoAPIName, PPB_GRAPHICS_2D_INTERFACE_1_0, PPB_Graphics2D_1_0)
 PROXIED_IFACE(NoAPIName, PPB_GRAPHICS_2D_INTERFACE_1_1, PPB_Graphics2D_1_1)
+PROXIED_IFACE(NoAPIName, PPB_HOSTRESOLVER_INTERFACE_1_0, PPB_HostResolver_1_0)
 PROXIED_IFACE(NoAPIName, PPB_INPUT_EVENT_INTERFACE_1_0, PPB_InputEvent_1_0)
 PROXIED_IFACE(NoAPIName, PPB_KEYBOARD_INPUT_EVENT_INTERFACE_1_0,
               PPB_KeyboardInputEvent_1_0)
diff --git a/ppapi/thunk/ppb_host_resolver_api.h b/ppapi/thunk/ppb_host_resolver_api.h
index 0c4c8ef1..f2acde2 100644
--- a/ppapi/thunk/ppb_host_resolver_api.h
+++ b/ppapi/thunk/ppb_host_resolver_api.h
@@ -6,7 +6,7 @@
 #define PPAPI_THUNK_PPB_HOST_RESOLVER_API_H_
 
 #include "base/memory/ref_counted.h"
-#include "ppapi/c/dev/ppb_host_resolver_dev.h"
+#include "ppapi/c/ppb_host_resolver.h"
 #include "ppapi/thunk/ppapi_thunk_export.h"
 
 namespace ppapi {
@@ -21,7 +21,7 @@ class PPAPI_THUNK_EXPORT PPB_HostResolver_API {
 
   virtual int32_t Resolve(const char* host,
                           uint16_t port,
-                          const PP_HostResolver_Hint_Dev* hint,
+                          const PP_HostResolver_Hint* hint,
                           scoped_refptr<TrackedCallback> callback) = 0;
   virtual PP_Var GetCanonicalName() = 0;
   virtual uint32_t GetNetAddressCount() = 0;
diff --git a/ppapi/thunk/ppb_host_resolver_dev_thunk.cc b/ppapi/thunk/ppb_host_resolver_thunk.cc
index 332478b..03b8d01 100644
--- a/ppapi/thunk/ppb_host_resolver_dev_thunk.cc
+++ b/ppapi/thunk/ppb_host_resolver_thunk.cc
@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-// From dev/ppb_host_resolver_dev.idl modified Sun Jun 09 11:17:35 2013.
+// From ppb_host_resolver.idl modified Thu Jun 20 15:36:07 2013.
 
-#include "ppapi/c/dev/ppb_host_resolver_dev.h"
 #include "ppapi/c/pp_completion_callback.h"
 #include "ppapi/c/pp_errors.h"
+#include "ppapi/c/ppb_host_resolver.h"
 #include "ppapi/shared_impl/tracked_callback.h"
 #include "ppapi/thunk/enter.h"
 #include "ppapi/thunk/ppb_host_resolver_api.h"
@@ -20,7 +20,7 @@ namespace thunk {
 namespace {
 
 PP_Resource Create(PP_Instance instance) {
-  VLOG(4) << "PPB_HostResolver_Dev::Create()";
+  VLOG(4) << "PPB_HostResolver::Create()";
   EnterResourceCreation enter(instance);
   if (enter.failed())
     return 0;
@@ -28,7 +28,7 @@ PP_Resource Create(PP_Instance instance) {
 }
 
 PP_Bool IsHostResolver(PP_Resource resource) {
-  VLOG(4) << "PPB_HostResolver_Dev::IsHostResolver()";
+  VLOG(4) << "PPB_HostResolver::IsHostResolver()";
   EnterResource<PPB_HostResolver_API> enter(resource, false);
   return PP_FromBool(enter.succeeded());
 }
@@ -36,9 +36,9 @@ PP_Bool IsHostResolver(PP_Resource resource) {
 int32_t Resolve(PP_Resource host_resolver,
                 const char* host,
                 uint16_t port,
-                const struct PP_HostResolver_Hint_Dev* hint,
+                const struct PP_HostResolver_Hint* hint,
                 struct PP_CompletionCallback callback) {
-  VLOG(4) << "PPB_HostResolver_Dev::Resolve()";
+  VLOG(4) << "PPB_HostResolver::Resolve()";
   EnterResource<PPB_HostResolver_API> enter(host_resolver, callback, true);
   if (enter.failed())
     return enter.retval();
@@ -49,7 +49,7 @@ int32_t Resolve(PP_Resource host_resolver,
 }
 
 struct PP_Var GetCanonicalName(PP_Resource host_resolver) {
-  VLOG(4) << "PPB_HostResolver_Dev::GetCanonicalName()";
+  VLOG(4) << "PPB_HostResolver::GetCanonicalName()";
   EnterResource<PPB_HostResolver_API> enter(host_resolver, true);
   if (enter.failed())
     return PP_MakeUndefined();
@@ -57,7 +57,7 @@ struct PP_Var GetCanonicalName(PP_Resource host_resolver) {
 }
 
 uint32_t GetNetAddressCount(PP_Resource host_resolver) {
-  VLOG(4) << "PPB_HostResolver_Dev::GetNetAddressCount()";
+  VLOG(4) << "PPB_HostResolver::GetNetAddressCount()";
   EnterResource<PPB_HostResolver_API> enter(host_resolver, true);
   if (enter.failed())
     return 0;
@@ -65,14 +65,14 @@ uint32_t GetNetAddressCount(PP_Resource host_resolver) {
 }
 
 PP_Resource GetNetAddress(PP_Resource host_resolver, uint32_t index) {
-  VLOG(4) << "PPB_HostResolver_Dev::GetNetAddress()";
+  VLOG(4) << "PPB_HostResolver::GetNetAddress()";
   EnterResource<PPB_HostResolver_API> enter(host_resolver, true);
   if (enter.failed())
     return 0;
   return enter.object()->GetNetAddress(index);
 }
 
-const PPB_HostResolver_Dev_0_1 g_ppb_hostresolver_dev_thunk_0_1 = {
+const PPB_HostResolver_1_0 g_ppb_hostresolver_thunk_1_0 = {
   &Create,
   &IsHostResolver,
   &Resolve,
@@ -83,8 +83,8 @@ const PPB_HostResolver_Dev_0_1 g_ppb_hostresolver_dev_thunk_0_1 = {
 
 }  // namespace
 
-const PPB_HostResolver_Dev_0_1* GetPPB_HostResolver_Dev_0_1_Thunk() {
-  return &g_ppb_hostresolver_dev_thunk_0_1;
+const PPB_HostResolver_1_0* GetPPB_HostResolver_1_0_Thunk() {
+  return &g_ppb_hostresolver_thunk_1_0;
 }
 
 }  // namespace thunk