Rename InterfaceID to ApiID and move the file.

ppapi/proxy/ppb_broker_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_broker_proxy.h"
 
 #include "base/bind.h"
 #include "ppapi/c/pp_errors.h"
 #include "ppapi/c/trusted/ppb_broker_trusted.h"
 #include "ppapi/proxy/enter_proxy.h"
@@ skipping 94 matching lines @@
   if (current_connect_callback_.func)
     return PP_ERROR_INPROGRESS;
   else if (called_connect_)
     return PP_ERROR_FAILED;
 
   current_connect_callback_ = connect_callback;
   called_connect_ = true;
 
   bool success = PluginDispatcher::GetForResource(this)->Send(
       new PpapiHostMsg_PPBBroker_Connect(
-          INTERFACE_ID_PPB_BROKER, host_resource()));
+          API_ID_PPB_BROKER, host_resource()));
   return success ?  PP_OK_COMPLETIONPENDING : PP_ERROR_FAILED;
 }
 
 int32_t Broker::GetHandle(int32_t* handle) {
   if (socket_handle_ == base::kInvalidPlatformFileValue)
     return PP_ERROR_FAILED;
   *handle = PlatformFileToInt(socket_handle_);
   return PP_OK;
 }
 
@@ skipping 27 matching lines @@
 }
 
 // static
 PP_Resource PPB_Broker_Proxy::CreateProxyResource(PP_Instance instance) {
   PluginDispatcher* dispatcher = PluginDispatcher::GetForInstance(instance);
   if (!dispatcher)
     return 0;
 
   HostResource result;
   dispatcher->Send(new PpapiHostMsg_PPBBroker_Create(
-      INTERFACE_ID_PPB_BROKER, instance, &result));
+      API_ID_PPB_BROKER, instance, &result));
   if (result.is_null())
     return 0;
   return (new Broker(result))->GetReference();
 }
 
 bool PPB_Broker_Proxy::OnMessageReceived(const IPC::Message& msg) {
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(PPB_Broker_Proxy, msg)
     IPC_MESSAGE_HANDLER(PpapiHostMsg_PPBBroker_Create, OnMsgCreate)
     IPC_MESSAGE_HANDLER(PpapiHostMsg_PPBBroker_Connect, OnMsgConnect)
@@ skipping 67 matching lines @@
         result = PP_ERROR_FAILED;
         // Assume the local handle was closed even if the foreign handle could
         // not be created.
       }
     }
   }
   DCHECK(result == PP_OK ||
          foreign_socket_handle == IPC::InvalidPlatformFileForTransit());
 
   bool success = dispatcher()->Send(new PpapiMsg_PPBBroker_ConnectComplete(
-      INTERFACE_ID_PPB_BROKER, broker, foreign_socket_handle, result));
+      API_ID_PPB_BROKER, broker, foreign_socket_handle, result));
 
   if (!success || result != PP_OK) {
       // The plugin did not receive the handle, so it must be closed.
       // The easiest way to clean it up is to just put it in an object
       // and then close it. This failure case is not performance critical.
       // The handle could still leak if Send succeeded but the IPC later failed.
       base::SyncSocket temp_socket(
           IPC::PlatformFileForTransitToPlatformFile(foreign_socket_handle));
   }
 }
 
 }  // namespace proxy
 }  // namespace ppapi