Rename InterfaceID to ApiID and move the file.

This was originally in the proxy and had a 1:1 correspondence with an
interface. Then we reused this for other stuff and then merged some interfaces
into larger APIs (ppapi/thunk/*_api.h) so the name was no longer accurate.
It was wrong to be in the proxy directory since directories at a "lower level"
than the proxy (ppapi/shared_impl and webkit/plugins/ppapi) depended on it.

This renames to ApiID (I avoided APIID since it looks like a define) which is
the proper description of the class, and moved it to shared_impl. This fixes
the deps since there are no longer any bad dependencies on the proxy directory.

TEST=it compiles
BUG=none

Review URL: http://codereview.chromium.org/8333004

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

4 files changed, 10 insertions, 16 deletions

diff --git a/webkit/plugins/ppapi/DEPS b/webkit/plugins/ppapi/DEPS
index a2b6af6..5cb4caa 100644
--- a/webkit/plugins/ppapi/DEPS
+++ b/webkit/plugins/ppapi/DEPS
@@ -5,8 +5,4 @@ include_rules = [
   "+printing",
   "+media/video",
   "+ui/base/ime",
-
-  # This should technically not be allowed. Brett is refactoring this and will
-  # move this file to a more proper shared location in a future iteration.
-  "+ppapi/proxy/interface_id.h",
 ]
diff --git a/webkit/plugins/ppapi/host_globals.cc b/webkit/plugins/ppapi/host_globals.cc
index b2048aa..a753570 100644
--- a/webkit/plugins/ppapi/host_globals.cc
+++ b/webkit/plugins/ppapi/host_globals.cc
@@ -8,7 +8,7 @@
 
 #include "base/logging.h"
 #include "base/rand_util.h"
-#include "ppapi/proxy/interface_id.h"
+#include "ppapi/shared_impl/api_id.h"
 #include "ppapi/shared_impl/function_group_base.h"
 #include "ppapi/shared_impl/id_assignment.h"
 #include "webkit/plugins/ppapi/plugin_module.h"
@@ -34,7 +34,7 @@ struct HostGlobals::InstanceData {
 
   // Lazily allocated function proxies for the different interfaces.
   scoped_ptr< ::ppapi::FunctionGroupBase >
-      function_proxies[::ppapi::proxy::INTERFACE_ID_COUNT];
+      function_proxies[::ppapi::API_ID_COUNT];
 };
 
 HostGlobals* HostGlobals::host_globals_ = NULL;
@@ -57,9 +57,8 @@ HostGlobals::~HostGlobals() {
   return &host_var_tracker_;
 }
 
-::ppapi::FunctionGroupBase* HostGlobals::GetFunctionAPI(
-    PP_Instance pp_instance,
-    ::ppapi::proxy::InterfaceID id) {
+::ppapi::FunctionGroupBase* HostGlobals::GetFunctionAPI(PP_Instance pp_instance,
+                                                        ::ppapi::ApiID id) {
   // Get the instance object. This also ensures that the instance data is in
   // the map, since we need it below.
   PluginInstance* instance = GetInstance(pp_instance);
@@ -68,7 +67,7 @@ HostGlobals::~HostGlobals() {
 
   // The instance one is special, since it's just implemented by the instance
   // object.
-  if (id == ::ppapi::proxy::INTERFACE_ID_PPB_INSTANCE)
+  if (id == ::ppapi::API_ID_PPB_INSTANCE)
     return instance;
 
   scoped_ptr< ::ppapi::FunctionGroupBase >& proxy =
@@ -77,16 +76,16 @@ HostGlobals::~HostGlobals() {
     return proxy.get();
 
   switch (id) {
-    case ::ppapi::proxy::INTERFACE_ID_PPB_CURSORCONTROL:
+    case ::ppapi::API_ID_PPB_CURSORCONTROL:
       proxy.reset(new PPB_CursorControl_Impl(instance));
       break;
-    case ::ppapi::proxy::INTERFACE_ID_PPB_FONT:
+    case ::ppapi::API_ID_PPB_FONT:
       proxy.reset(new PPB_Font_FunctionImpl(instance));
       break;
-    case ::ppapi::proxy::INTERFACE_ID_PPB_TEXT_INPUT:
+    case ::ppapi::API_ID_PPB_TEXT_INPUT:
       proxy.reset(new PPB_TextInput_Impl(instance));
       break;
-    case ::ppapi::proxy::INTERFACE_ID_RESOURCE_CREATION:
+    case ::ppapi::API_ID_RESOURCE_CREATION:
       proxy.reset(new ResourceCreationImpl(instance));
       break;
     default:
diff --git a/webkit/plugins/ppapi/host_globals.h b/webkit/plugins/ppapi/host_globals.h
index 580ff5d..7a4b497 100644
--- a/webkit/plugins/ppapi/host_globals.h
+++ b/webkit/plugins/ppapi/host_globals.h
@@ -32,7 +32,7 @@ class HostGlobals : public ::ppapi::PpapiGlobals {
   virtual ::ppapi::VarTracker* GetVarTracker() OVERRIDE;
   virtual ::ppapi::FunctionGroupBase* GetFunctionAPI(
       PP_Instance inst,
-      ::ppapi::proxy::InterfaceID id) OVERRIDE;
+      ::ppapi::ApiID id) OVERRIDE;
   virtual PP_Module GetModuleForInstance(PP_Instance instance) OVERRIDE;
 
   HostResourceTracker* host_resource_tracker() {
diff --git a/webkit/plugins/ppapi/host_var_tracker.h b/webkit/plugins/ppapi/host_var_tracker.h
index 578c29b..b8cdb07 100644
--- a/webkit/plugins/ppapi/host_var_tracker.h
+++ b/webkit/plugins/ppapi/host_var_tracker.h
@@ -16,7 +16,6 @@
 #include "ppapi/c/pp_instance.h"
 #include "ppapi/c/pp_module.h"
 #include "ppapi/c/pp_resource.h"
-#include "ppapi/proxy/interface_id.h"
 #include "ppapi/shared_impl/function_group_base.h"
 #include "ppapi/shared_impl/resource_tracker.h"
 #include "ppapi/shared_impl/var_tracker.h"