Rename InterfaceID to ApiID and move the file.

ppapi/proxy/ppb_instance_proxy.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 "ppapi/proxy/ppb_instance_proxy.h"
 
 #include "ppapi/c/pp_errors.h"
 #include "ppapi/c/pp_var.h"
 #include "ppapi/c/ppb_instance.h"
 #include "ppapi/c/ppb_messaging.h"
@@ skipping 34 matching lines @@
 }
 
 PPB_Instance_Proxy::~PPB_Instance_Proxy() {
 }
 
 // static
 const InterfaceProxy::Info* PPB_Instance_Proxy::GetInfoPrivate() {
   static const Info info = {
     ppapi::thunk::GetPPB_Instance_Private_Thunk(),
     PPB_INSTANCE_PRIVATE_INTERFACE,
-    INTERFACE_ID_NONE,  // 1_0 is the canonical one.
+    API_ID_NONE,  // 1_0 is the canonical one.
     false,
     &CreateInstanceProxy,
   };
   return &info;
 }
 
 bool PPB_Instance_Proxy::OnMessageReceived(const IPC::Message& msg) {
   // Prevent the dispatcher from going away during a call to ExecuteScript.
   // This must happen OUTSIDE of ExecuteScript since the SerializedVars use
   // the dispatcher upon return of the function (converting the
@@ skipping 57 matching lines @@
 
 PP_Bool PPB_Instance_Proxy::BindGraphics(PP_Instance instance,
                                          PP_Resource device) {
   Resource* object =
       PpapiGlobals::Get()->GetResourceTracker()->GetResource(device);
   if (!object || object->pp_instance() != instance)
     return PP_FALSE;
 
   PP_Bool result = PP_FALSE;
   dispatcher()->Send(new PpapiHostMsg_PPBInstance_BindGraphics(
-      INTERFACE_ID_PPB_INSTANCE, instance, object->host_resource(),
+      API_ID_PPB_INSTANCE, instance, object->host_resource(),
       &result));
   return result;
 }
 
 PP_Bool PPB_Instance_Proxy::IsFullFrame(PP_Instance instance) {
   PP_Bool result = PP_FALSE;
   dispatcher()->Send(new PpapiHostMsg_PPBInstance_IsFullFrame(
-      INTERFACE_ID_PPB_INSTANCE, instance, &result));
+      API_ID_PPB_INSTANCE, instance, &result));
   return result;
 }
 
 PP_Var PPB_Instance_Proxy::GetWindowObject(PP_Instance instance) {
   ReceiveSerializedVarReturnValue result;
   dispatcher()->Send(new PpapiHostMsg_PPBInstance_GetWindowObject(
-      INTERFACE_ID_PPB_INSTANCE, instance, &result));
+      API_ID_PPB_INSTANCE, instance, &result));
   return result.Return(dispatcher());
 }
 
 PP_Var PPB_Instance_Proxy::GetOwnerElementObject(PP_Instance instance) {
   ReceiveSerializedVarReturnValue result;
   dispatcher()->Send(new PpapiHostMsg_PPBInstance_GetOwnerElementObject(
-      INTERFACE_ID_PPB_INSTANCE, instance, &result));
+      API_ID_PPB_INSTANCE, instance, &result));
   return result.Return(dispatcher());
 }
 
 PP_Var PPB_Instance_Proxy::ExecuteScript(PP_Instance instance,
                                          PP_Var script,
                                          PP_Var* exception) {
   ReceiveSerializedException se(dispatcher(), exception);
   if (se.IsThrown())
     return PP_MakeUndefined();
 
   ReceiveSerializedVarReturnValue result;
   dispatcher()->Send(new PpapiHostMsg_PPBInstance_ExecuteScript(
-      INTERFACE_ID_PPB_INSTANCE, instance,
+      API_ID_PPB_INSTANCE, instance,
       SerializedVarSendInput(dispatcher(), script), &se, &result));
   return result.Return(dispatcher());
 }
 
 PP_Var PPB_Instance_Proxy::GetDefaultCharSet(PP_Instance instance) {
   PluginDispatcher* dispatcher = PluginDispatcher::GetForInstance(instance);
   if (!dispatcher)
     return PP_MakeUndefined();
 
   ReceiveSerializedVarReturnValue result;
   dispatcher->Send(new PpapiHostMsg_PPBInstance_GetDefaultCharSet(
-      INTERFACE_ID_PPB_INSTANCE, instance, &result));
+      API_ID_PPB_INSTANCE, instance, &result));
   return result.Return(dispatcher);
 }
 
 void PPB_Instance_Proxy::Log(PP_Instance instance,
                              int log_level,
                              PP_Var value) {
   dispatcher()->Send(new PpapiHostMsg_PPBInstance_Log(
-      INTERFACE_ID_PPB_INSTANCE, instance, static_cast<int>(log_level),
+      API_ID_PPB_INSTANCE, instance, static_cast<int>(log_level),
       SerializedVarSendInput(dispatcher(), value)));
 }
 
 void PPB_Instance_Proxy::LogWithSource(PP_Instance instance,
                                        int log_level,
                                        PP_Var source,
                                        PP_Var value) {
   dispatcher()->Send(new PpapiHostMsg_PPBInstance_LogWithSource(
-      INTERFACE_ID_PPB_INSTANCE, instance, static_cast<int>(log_level),
+      API_ID_PPB_INSTANCE, instance, static_cast<int>(log_level),
       SerializedVarSendInput(dispatcher(), source),
       SerializedVarSendInput(dispatcher(), value)));
 }
 
 void PPB_Instance_Proxy::NumberOfFindResultsChanged(PP_Instance instance,
                                                     int32_t total,
                                                     PP_Bool final_result) {
   NOTIMPLEMENTED();  // Not proxied yet.
 }
 
@@ skipping 15 matching lines @@
       GetInstanceData(instance);
   if (!data)
     return PP_FALSE;
   return data->flash_fullscreen;
 }
 
 PP_Bool PPB_Instance_Proxy::SetFullscreen(PP_Instance instance,
                                           PP_Bool fullscreen) {
   PP_Bool result = PP_FALSE;
   dispatcher()->Send(new PpapiHostMsg_PPBInstance_SetFullscreen(
-      INTERFACE_ID_PPB_INSTANCE, instance, fullscreen, &result));
+      API_ID_PPB_INSTANCE, instance, fullscreen, &result));
   return result;
 }
 
 PP_Bool PPB_Instance_Proxy::FlashSetFullscreen(PP_Instance instance,
                                                PP_Bool fullscreen) {
   PP_Bool result = PP_FALSE;
   dispatcher()->Send(new PpapiHostMsg_PPBInstance_FlashSetFullscreen(
-      INTERFACE_ID_PPB_INSTANCE, instance, fullscreen, &result));
+      API_ID_PPB_INSTANCE, instance, fullscreen, &result));
   return result;
 }
 
 PP_Bool PPB_Instance_Proxy::GetScreenSize(PP_Instance instance,
                                           PP_Size* size) {
   PP_Bool result = PP_FALSE;
   dispatcher()->Send(new PpapiHostMsg_PPBInstance_GetScreenSize(
-      INTERFACE_ID_PPB_INSTANCE, instance, &result, size));
+      API_ID_PPB_INSTANCE, instance, &result, size));
   return result;
 }
 
 PP_Bool PPB_Instance_Proxy::FlashGetScreenSize(PP_Instance instance,
                                                PP_Size* size) {
   PP_Bool result = PP_FALSE;
   dispatcher()->Send(new PpapiHostMsg_PPBInstance_FlashGetScreenSize(
-      INTERFACE_ID_PPB_INSTANCE, instance, &result, size));
+      API_ID_PPB_INSTANCE, instance, &result, size));
   return result;
 }
 
 int32_t PPB_Instance_Proxy::RequestInputEvents(PP_Instance instance,
                                                uint32_t event_classes) {
   dispatcher()->Send(new PpapiHostMsg_PPBInstance_RequestInputEvents(
-      INTERFACE_ID_PPB_INSTANCE, instance, false, event_classes));
+      API_ID_PPB_INSTANCE, instance, false, event_classes));
 
   // We always register for the classes we can handle, this function validates
   // the flags so we can notify it if anything was invalid, without requiring
   // a sync reply.
   return ValidateRequestInputEvents(false, event_classes);
 }
 
 int32_t PPB_Instance_Proxy::RequestFilteringInputEvents(
     PP_Instance instance,
     uint32_t event_classes) {
   dispatcher()->Send(new PpapiHostMsg_PPBInstance_RequestInputEvents(
-      INTERFACE_ID_PPB_INSTANCE, instance, true, event_classes));
+      API_ID_PPB_INSTANCE, instance, true, event_classes));
 
   // We always register for the classes we can handle, this function validates
   // the flags so we can notify it if anything was invalid, without requiring
   // a sync reply.
   return ValidateRequestInputEvents(true, event_classes);
 }
 
 void PPB_Instance_Proxy::ClearInputEventRequest(PP_Instance instance,
                                                 uint32_t event_classes) {
   dispatcher()->Send(new PpapiHostMsg_PPBInstance_ClearInputEvents(
-      INTERFACE_ID_PPB_INSTANCE, instance, event_classes));
+      API_ID_PPB_INSTANCE, instance, event_classes));
 }
 
 void PPB_Instance_Proxy::ZoomChanged(PP_Instance instance,
                                      double factor) {
   // Not proxied yet.
   NOTIMPLEMENTED();
 }
 
 void PPB_Instance_Proxy::ZoomLimitsChanged(PP_Instance instance,
                                            double minimum_factor,
                                            double maximium_factor) {
   // Not proxied yet.
   NOTIMPLEMENTED();
 }
 
 PP_Var PPB_Instance_Proxy::ResolveRelativeToDocument(
     PP_Instance instance,
     PP_Var relative,
     PP_URLComponents_Dev* components) {
   ReceiveSerializedVarReturnValue result;
   dispatcher()->Send(new PpapiHostMsg_PPBInstance_ResolveRelativeToDocument(
-      INTERFACE_ID_PPB_INSTANCE, instance,
+      API_ID_PPB_INSTANCE, instance,
       SerializedVarSendInput(dispatcher(), relative),
       &result));
   return URLUtilImpl::ConvertComponentsAndReturnURL(result.Return(dispatcher()),
                                                     components);
 }
 
 PP_Bool PPB_Instance_Proxy::DocumentCanRequest(PP_Instance instance,
                                                PP_Var url) {
   PP_Bool result = PP_FALSE;
   dispatcher()->Send(new PpapiHostMsg_PPBInstance_DocumentCanRequest(
-      INTERFACE_ID_PPB_INSTANCE, instance,
+      API_ID_PPB_INSTANCE, instance,
       SerializedVarSendInput(dispatcher(), url),
       &result));
   return result;
 }
 
 PP_Bool PPB_Instance_Proxy::DocumentCanAccessDocument(PP_Instance instance,
                                                       PP_Instance target) {
   PP_Bool result = PP_FALSE;
   dispatcher()->Send(new PpapiHostMsg_PPBInstance_DocumentCanAccessDocument(
-      INTERFACE_ID_PPB_INSTANCE, instance, target, &result));
+      API_ID_PPB_INSTANCE, instance, target, &result));
   return result;
 }
 
 PP_Var PPB_Instance_Proxy::GetDocumentURL(PP_Instance instance,
                                           PP_URLComponents_Dev* components) {
   ReceiveSerializedVarReturnValue result;
   dispatcher()->Send(new PpapiHostMsg_PPBInstance_GetDocumentURL(
-      INTERFACE_ID_PPB_INSTANCE, instance, &result));
+      API_ID_PPB_INSTANCE, instance, &result));
   return URLUtilImpl::ConvertComponentsAndReturnURL(result.Return(dispatcher()),
                                                     components);
 }
 
 PP_Var PPB_Instance_Proxy::GetPluginInstanceURL(
       PP_Instance instance,
       PP_URLComponents_Dev* components) {
   ReceiveSerializedVarReturnValue result;
   dispatcher()->Send(new PpapiHostMsg_PPBInstance_GetPluginInstanceURL(
-      INTERFACE_ID_PPB_INSTANCE, instance, &result));
+      API_ID_PPB_INSTANCE, instance, &result));
   return URLUtilImpl::ConvertComponentsAndReturnURL(result.Return(dispatcher()),
                                                     components);
 }
 
 void PPB_Instance_Proxy::PostMessage(PP_Instance instance,
                                      PP_Var message) {
   dispatcher()->Send(new PpapiHostMsg_PPBInstance_PostMessage(
-      INTERFACE_ID_PPB_INSTANCE,
+      API_ID_PPB_INSTANCE,
       instance, SerializedVarSendInput(dispatcher(), message)));
 }
 
 int32_t PPB_Instance_Proxy::LockMouse(PP_Instance instance,
                                       PP_CompletionCallback callback) {
   if (!callback.func)
     return PP_ERROR_BADARGUMENT;
 
   dispatcher()->Send(new PpapiHostMsg_PPBInstance_LockMouse(
-      INTERFACE_ID_PPB_INSTANCE, instance, SendCallback(callback)));
+      API_ID_PPB_INSTANCE, instance, SendCallback(callback)));
   return PP_OK_COMPLETIONPENDING;
 }
 
 void PPB_Instance_Proxy::UnlockMouse(PP_Instance instance) {
   dispatcher()->Send(new PpapiHostMsg_PPBInstance_UnlockMouse(
-      INTERFACE_ID_PPB_INSTANCE, instance));
+      API_ID_PPB_INSTANCE, instance));
 }
 
 void PPB_Instance_Proxy::OnMsgGetWindowObject(
     PP_Instance instance,
     SerializedVarReturnValue result) {
   EnterInstanceNoLock enter(instance, false);
   if (enter.succeeded())
     result.Return(dispatcher(), enter.functions()->GetWindowObject(instance));
 }
 
@@ skipping 192 matching lines @@
     SerializedVarReturnValue result) {
   EnterFunctionNoLock<PPB_Instance_FunctionAPI> enter(instance, true);
   if (enter.succeeded()) {
     result.Return(dispatcher(),
                   enter.functions()->GetPluginInstanceURL(instance, NULL));
   }
 }
 
 }  // namespace proxy
 }  // namespace ppapi