Pepper thunks: Merge '_Private' into overall API.

Dev and Trusted interfaces are already intergrated into APIs in ppapi/thunk.
For many APIs, this is already the case.

This is needed to autogenerate thunks for some "private" IDL files.

Tested:
  Built chrome and browser_tests.

BUG=

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

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

7 files changed, 29 insertions, 24 deletions

diff --git a/ppapi/generators/idl_thunk.py b/ppapi/generators/idl_thunk.py
index 7159412..1f49857 100755
--- a/ppapi/generators/idl_thunk.py
+++ b/ppapi/generators/idl_thunk.py
@@ -98,6 +98,8 @@ def _AddApiHeader(filenode, meta):
     api_basename = api_basename[:-len('_dev')]
   if api_basename.endswith('_trusted'):
     api_basename = api_basename[:-len('_trusted')]
+  if api_basename.endswith('_private'):
+    api_basename = api_basename[:-len('_private')]
   meta.AddApi(api_basename + '_api')
 
 
@@ -109,6 +111,8 @@ def _MakeEnterLine(filenode, interface, member, arg, handle_errors, callback,
     api_name = api_name[:-len('Trusted')]
   if api_name.endswith('_Dev'):
     api_name = api_name[:-len('_Dev')]
+  if api_name.endswith('_Private'):
+    api_name = api_name[:-len('_Private')]
   api_name += '_API'
   if member.GetProperty('api'):  # Override API name.
     manually_provided_api = True
diff --git a/ppapi/ppapi_shared.gypi b/ppapi/ppapi_shared.gypi
index 6802d59..db87368 100644
--- a/ppapi/ppapi_shared.gypi
+++ b/ppapi/ppapi_shared.gypi
@@ -211,7 +211,7 @@
           'thunk/ppb_messaging_thunk.cc',
           'thunk/ppb_mouse_cursor_thunk.cc',
           'thunk/ppb_mouse_lock_thunk.cc',
-          'thunk/ppb_network_list_private_api.h',
+          'thunk/ppb_network_list_api.h',
           'thunk/ppb_network_list_private_thunk.cc',
           'thunk/ppb_network_monitor_private_api.h',
           'thunk/ppb_network_monitor_private_thunk.cc',
diff --git a/ppapi/shared_impl/ppb_network_list_private_shared.cc b/ppapi/shared_impl/ppb_network_list_private_shared.cc
index 0430289..29874b3 100644
--- a/ppapi/shared_impl/ppb_network_list_private_shared.cc
+++ b/ppapi/shared_impl/ppb_network_list_private_shared.cc
@@ -48,8 +48,8 @@ PP_Resource PPB_NetworkList_Private_Shared::Create(
   return object->GetReference();
 }
 
-::ppapi::thunk::PPB_NetworkList_Private_API*
-PPB_NetworkList_Private_Shared::AsPPB_NetworkList_Private_API() {
+::ppapi::thunk::PPB_NetworkList_API*
+PPB_NetworkList_Private_Shared::AsPPB_NetworkList_API() {
   return this;
 }
 
diff --git a/ppapi/shared_impl/ppb_network_list_private_shared.h b/ppapi/shared_impl/ppb_network_list_private_shared.h
index 196f386..916cc12 100644
--- a/ppapi/shared_impl/ppb_network_list_private_shared.h
+++ b/ppapi/shared_impl/ppb_network_list_private_shared.h
@@ -11,7 +11,7 @@
 #include "base/basictypes.h"
 #include "base/memory/ref_counted.h"
 #include "ppapi/shared_impl/resource.h"
-#include "ppapi/thunk/ppb_network_list_private_api.h"
+#include "ppapi/thunk/ppb_network_list_api.h"
 
 namespace ppapi {
 
@@ -49,7 +49,7 @@ class PPAPI_SHARED_EXPORT NetworkListStorage
 
 class PPAPI_SHARED_EXPORT PPB_NetworkList_Private_Shared
     : public ::ppapi::Resource,
-      public ::ppapi::thunk::PPB_NetworkList_Private_API {
+      public ::ppapi::thunk::PPB_NetworkList_API {
  public:
   static PP_Resource Create(ResourceObjectType type,
                             PP_Instance instance,
@@ -58,10 +58,10 @@ class PPAPI_SHARED_EXPORT PPB_NetworkList_Private_Shared
   virtual ~PPB_NetworkList_Private_Shared();
 
   // Resource override.
-  virtual ::ppapi::thunk::PPB_NetworkList_Private_API*
-      AsPPB_NetworkList_Private_API() OVERRIDE;
+  virtual ::ppapi::thunk::PPB_NetworkList_API*
+      AsPPB_NetworkList_API() OVERRIDE;
 
-  // PPB_NetworkList_Private_API implementation.
+  // PPB_NetworkList_API implementation.
   virtual const NetworkList& GetNetworkListData() const OVERRIDE;
   virtual uint32_t GetCount() OVERRIDE;
   virtual PP_Var GetName(uint32_t index) OVERRIDE;
diff --git a/ppapi/shared_impl/resource.h b/ppapi/shared_impl/resource.h
index 259fedd..ddfdcfb 100644
--- a/ppapi/shared_impl/resource.h
+++ b/ppapi/shared_impl/resource.h
@@ -52,7 +52,7 @@
   F(PPB_InputEvent_API) \
   F(PPB_LayerCompositor_API) \
   F(PPB_MessageLoop_API) \
-  F(PPB_NetworkList_Private_API) \
+  F(PPB_NetworkList_API) \
   F(PPB_NetworkMonitor_Private_API) \
   F(PPB_PDF_API) \
   F(PPB_Printing_API) \
diff --git a/ppapi/thunk/ppb_network_list_private_api.h b/ppapi/thunk/ppb_network_list_api.h
index ea91349..bbadded 100644
--- a/ppapi/thunk/ppb_network_list_private_api.h
+++ b/ppapi/thunk/ppb_network_list_api.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef PPAPI_THUNK_PPB_NETWORK_LIST_PRIVATE_API_H_
-#define PPAPI_THUNK_PPB_NETWORK_LIST_PRIVATE_API_H_
+#ifndef PPAPI_THUNK_PPB_NETWORK_LIST_API_H_
+#define PPAPI_THUNK_PPB_NETWORK_LIST_API_H_
 
 #include <vector>
 
@@ -17,14 +17,15 @@ typedef std::vector<NetworkInfo> NetworkList;
 
 namespace thunk {
 
-class PPAPI_THUNK_EXPORT PPB_NetworkList_Private_API {
+class PPAPI_THUNK_EXPORT PPB_NetworkList_API {
  public:
-  virtual ~PPB_NetworkList_Private_API() {}
+  virtual ~PPB_NetworkList_API() {}
 
   // This function is not exposed through the C API, but returns the
   // internal data for easy proxying.
   virtual const NetworkList& GetNetworkListData() const = 0;
 
+  // Private API
   virtual uint32_t GetCount() = 0;
   virtual PP_Var GetName(uint32_t index) = 0;
   virtual PP_NetworkListType_Private GetType(uint32_t index) = 0;
@@ -39,4 +40,4 @@ class PPAPI_THUNK_EXPORT PPB_NetworkList_Private_API {
 }  // namespace thunk
 }  // namespace ppapi
 
-#endif  // PPAPI_THUNK_PPB_NETWORK_LIST_PRIVATE_API_H_
+#endif  // PPAPI_THUNK_PPB_NETWORK_LIST_API_H_
diff --git a/ppapi/thunk/ppb_network_list_private_thunk.cc b/ppapi/thunk/ppb_network_list_private_thunk.cc
index a07ac71..211c7936 100644
--- a/ppapi/thunk/ppb_network_list_private_thunk.cc
+++ b/ppapi/thunk/ppb_network_list_private_thunk.cc
@@ -3,14 +3,14 @@
 // found in the LICENSE file.
 
 // From private/ppb_network_list_private.idl,
-//   modified Wed Apr  3 10:41:20 2013.
+//   modified Tue Apr 16 11:25:45 2013.
 
 #include "ppapi/c/pp_errors.h"
 #include "ppapi/c/private/ppb_network_list_private.h"
 #include "ppapi/shared_impl/tracked_callback.h"
 #include "ppapi/thunk/enter.h"
 #include "ppapi/thunk/ppb_instance_api.h"
-#include "ppapi/thunk/ppb_network_list_private_api.h"
+#include "ppapi/thunk/ppb_network_list_api.h"
 #include "ppapi/thunk/resource_creation_api.h"
 #include "ppapi/thunk/thunk.h"
 
@@ -21,13 +21,13 @@ namespace {
 
 PP_Bool IsNetworkList(PP_Resource resource) {
   VLOG(4) << "PPB_NetworkList_Private::IsNetworkList()";
-  EnterResource<PPB_NetworkList_Private_API> enter(resource, false);
+  EnterResource<PPB_NetworkList_API> enter(resource, false);
   return PP_FromBool(enter.succeeded());
 }
 
 uint32_t GetCount(PP_Resource resource) {
   VLOG(4) << "PPB_NetworkList_Private::GetCount()";
-  EnterResource<PPB_NetworkList_Private_API> enter(resource, true);
+  EnterResource<PPB_NetworkList_API> enter(resource, true);
   if (enter.failed())
     return 0;
   return enter.object()->GetCount();
@@ -35,7 +35,7 @@ uint32_t GetCount(PP_Resource resource) {
 
 struct PP_Var GetName(PP_Resource resource, uint32_t index) {
   VLOG(4) << "PPB_NetworkList_Private::GetName()";
-  EnterResource<PPB_NetworkList_Private_API> enter(resource, true);
+  EnterResource<PPB_NetworkList_API> enter(resource, true);
   if (enter.failed())
     return PP_MakeUndefined();
   return enter.object()->GetName(index);
@@ -43,7 +43,7 @@ struct PP_Var GetName(PP_Resource resource, uint32_t index) {
 
 PP_NetworkListType_Private GetType(PP_Resource resource, uint32_t index) {
   VLOG(4) << "PPB_NetworkList_Private::GetType()";
-  EnterResource<PPB_NetworkList_Private_API> enter(resource, true);
+  EnterResource<PPB_NetworkList_API> enter(resource, true);
   if (enter.failed())
     return PP_NETWORKLIST_UNKNOWN;
   return enter.object()->GetType(index);
@@ -51,7 +51,7 @@ PP_NetworkListType_Private GetType(PP_Resource resource, uint32_t index) {
 
 PP_NetworkListState_Private GetState(PP_Resource resource, uint32_t index) {
   VLOG(4) << "PPB_NetworkList_Private::GetState()";
-  EnterResource<PPB_NetworkList_Private_API> enter(resource, true);
+  EnterResource<PPB_NetworkList_API> enter(resource, true);
   if (enter.failed())
     return PP_NETWORKLIST_DOWN;
   return enter.object()->GetState(index);
@@ -62,7 +62,7 @@ int32_t GetIpAddresses(PP_Resource resource,
                        struct PP_NetAddress_Private addresses[],
                        uint32_t count) {
   VLOG(4) << "PPB_NetworkList_Private::GetIpAddresses()";
-  EnterResource<PPB_NetworkList_Private_API> enter(resource, true);
+  EnterResource<PPB_NetworkList_API> enter(resource, true);
   if (enter.failed())
     return enter.retval();
   return enter.object()->GetIpAddresses(index, addresses, count);
@@ -70,7 +70,7 @@ int32_t GetIpAddresses(PP_Resource resource,
 
 struct PP_Var GetDisplayName(PP_Resource resource, uint32_t index) {
   VLOG(4) << "PPB_NetworkList_Private::GetDisplayName()";
-  EnterResource<PPB_NetworkList_Private_API> enter(resource, true);
+  EnterResource<PPB_NetworkList_API> enter(resource, true);
   if (enter.failed())
     return PP_MakeUndefined();
   return enter.object()->GetDisplayName(index);
@@ -78,7 +78,7 @@ struct PP_Var GetDisplayName(PP_Resource resource, uint32_t index) {
 
 uint32_t GetMTU(PP_Resource resource, uint32_t index) {
   VLOG(4) << "PPB_NetworkList_Private::GetMTU()";
-  EnterResource<PPB_NetworkList_Private_API> enter(resource, true);
+  EnterResource<PPB_NetworkList_API> enter(resource, true);
   if (enter.failed())
     return 0;
   return enter.object()->GetMTU(index);