Rename InterfaceID to ApiID and move the file.

webkit/plugins/ppapi/host_globals.cc

 // Copyright (c) 2011 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 "webkit/plugins/ppapi/host_globals.h"
 
 #include <limits>
 
 #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"
 #include "webkit/plugins/ppapi/ppapi_plugin_instance.h"
 #include "webkit/plugins/ppapi/ppb_cursor_control_impl.h"
 #include "webkit/plugins/ppapi/ppb_font_impl.h"
 #include "webkit/plugins/ppapi/ppb_text_input_impl.h"
 #include "webkit/plugins/ppapi/resource_creation_impl.h"
 
 using ppapi::CheckIdType;
 using ppapi::MakeTypedId;
 using ppapi::PPIdType;
 
 namespace webkit {
 namespace ppapi {
 
 struct HostGlobals::InstanceData {
   InstanceData() : instance(0) {}
 
   // Non-owning pointer to the instance object. When a PluginInstance is
   // destroyed, it will notify us and we'll delete all associated data.
   PluginInstance* instance;
 
   // 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;
 
 HostGlobals::HostGlobals() : ::ppapi::PpapiGlobals() {
   DCHECK(!host_globals_);
   host_globals_ = this;
 }
 
 HostGlobals::~HostGlobals() {
   DCHECK(host_globals_ == this);
   host_globals_ = NULL;
 }
 
 ::ppapi::ResourceTracker* HostGlobals::GetResourceTracker() {
   return &host_resource_tracker_;
 }
 
 ::ppapi::VarTracker* HostGlobals::GetVarTracker() {
   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);
   if (!instance)
     return NULL;
 
   // 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 =
       instance_map_[pp_instance]->function_proxies[id];
   if (proxy.get())
     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:
       NOTREACHED();
   }
 
   return proxy.get();
 }
 
 PP_Module HostGlobals::GetModuleForInstance(PP_Instance instance) {
@@ skipping 79 matching lines @@
   DLOG_IF(ERROR, !CheckIdType(instance, ::ppapi::PP_ID_TYPE_INSTANCE))
       << instance << " is not a PP_Instance.";
   InstanceMap::iterator found = instance_map_.find(instance);
   if (found == instance_map_.end())
     return NULL;
   return found->second->instance;
 }
 
 }  // namespace ppapi
 }  // namespace webkit