Rename InterfaceID to ApiID and move the file.

ppapi/proxy/ppb_flash_net_connector_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_flash_net_connector_proxy.h"
 
 #include <algorithm>
 
 #include "ppapi/c/pp_errors.h"
 #include "ppapi/c/private/ppb_flash_net_connector.h"
@@ skipping 99 matching lines @@
 
 int32_t FlashNetConnector::ConnectTcp(
     const char* host,
     uint16_t port,
     PP_FileHandle* socket_out,
     PP_Flash_NetAddress* local_addr_out,
     PP_Flash_NetAddress* remote_addr_out,
     PP_CompletionCallback callback) {
   return ConnectWithMessage(
       new PpapiHostMsg_PPBFlashNetConnector_ConnectTcp(
-          INTERFACE_ID_PPB_FLASH_NETCONNECTOR, host_resource(), host, port),
+          API_ID_PPB_FLASH_NETCONNECTOR, host_resource(), host, port),
       socket_out, local_addr_out, remote_addr_out, callback);
 }
 
 int32_t FlashNetConnector::ConnectTcpAddress(
     const PP_Flash_NetAddress* addr,
     PP_FileHandle* socket_out,
     PP_Flash_NetAddress* local_addr_out,
     PP_Flash_NetAddress* remote_addr_out,
     PP_CompletionCallback callback) {
   return ConnectWithMessage(
       new PpapiHostMsg_PPBFlashNetConnector_ConnectTcpAddress(
-          INTERFACE_ID_PPB_FLASH_NETCONNECTOR,
+          API_ID_PPB_FLASH_NETCONNECTOR,
           host_resource(), NetAddressToString(*addr)),
       socket_out, local_addr_out, remote_addr_out, callback);
 }
 
 void FlashNetConnector::ConnectComplete(
     int32_t result,
     base::PlatformFile file,
     const std::string& local_addr_as_string,
     const std::string& remote_addr_as_string) {
   if (!callback_.func) {
@@ skipping 59 matching lines @@
 }
 
 PPB_Flash_NetConnector_Proxy::~PPB_Flash_NetConnector_Proxy() {
 }
 
 // static
 const InterfaceProxy::Info* PPB_Flash_NetConnector_Proxy::GetInfo() {
   static const Info info = {
     ppapi::thunk::GetPPB_Flash_NetConnector_Thunk(),
     PPB_FLASH_NETCONNECTOR_INTERFACE,
-    INTERFACE_ID_PPB_FLASH_NETCONNECTOR,
+    API_ID_PPB_FLASH_NETCONNECTOR,
     false,
     &CreateFlashNetConnectorProxy
   };
   return &info;
 }
 
 // static
 PP_Resource PPB_Flash_NetConnector_Proxy::CreateProxyResource(
     PP_Instance instance) {
   PluginDispatcher* dispatcher = PluginDispatcher::GetForInstance(instance);
   if (!dispatcher)
     return 0;
 
   HostResource result;
   dispatcher->Send(new PpapiHostMsg_PPBFlashNetConnector_Create(
-      INTERFACE_ID_PPB_FLASH_NETCONNECTOR, instance, &result));
+      API_ID_PPB_FLASH_NETCONNECTOR, instance, &result));
   if (result.is_null())
     return 0;
   return (new FlashNetConnector(result))->GetReference();
 }
 
 bool PPB_Flash_NetConnector_Proxy::OnMessageReceived(const IPC::Message& msg) {
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(PPB_Flash_NetConnector_Proxy, msg)
     IPC_MESSAGE_HANDLER(PpapiHostMsg_PPBFlashNetConnector_Create,
                         OnMsgCreate)
@@ skipping 78 matching lines @@
 }
 
 void PPB_Flash_NetConnector_Proxy::OnCompleteCallbackInHost(
     int32_t result,
     ConnectCallbackInfo* info) {
   // Callback must always delete the info.
   scoped_ptr<ConnectCallbackInfo> info_deletor(info);
 
   if (result == PP_OK) {
     dispatcher()->Send(new PpapiMsg_PPBFlashNetConnector_ConnectACK(
-        INTERFACE_ID_PPB_FLASH_NETCONNECTOR,
+        API_ID_PPB_FLASH_NETCONNECTOR,
         info->resource, result,
         dispatcher()->ShareHandleWithRemote(
             static_cast<base::PlatformFile>(info->handle), true),
         NetAddressToString(info->local_addr),
         NetAddressToString(info->remote_addr)));
   } else {
     dispatcher()->Send(new PpapiMsg_PPBFlashNetConnector_ConnectACK(
-        INTERFACE_ID_PPB_FLASH_NETCONNECTOR,
+        API_ID_PPB_FLASH_NETCONNECTOR,
         info->resource, result,
         IPC::InvalidPlatformFileForTransit(), std::string(), std::string()));
   }
 }
 
 }  // namespace proxy
 }  // namespace ppapi