Rename InterfaceID to ApiID and move the file.

ppapi/proxy/ppb_file_chooser_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_file_chooser_proxy.h"
 
 #include <queue>
 
 #include "base/bind.h"
 #include "ppapi/c/dev/ppb_file_chooser_dev.h"
@@ skipping 106 matching lines @@
                           const PP_CompletionCallback& callback) {
   if (!callback.func)
     return PP_ERROR_BLOCKS_MAIN_THREAD;
 
   if (current_show_callback_.func)
     return PP_ERROR_INPROGRESS;  // Can't show more than once.
 
   current_show_callback_ = callback;
   PluginDispatcher::GetForResource(this)->Send(
       new PpapiHostMsg_PPBFileChooser_Show(
-          INTERFACE_ID_PPB_FILE_CHOOSER,
+          API_ID_PPB_FILE_CHOOSER,
           host_resource(),
           save_as,
           suggested_file_name ? suggested_file_name : "",
           require_user_gesture));
   return PP_OK_COMPLETIONPENDING;
 }
 
 PP_Resource FileChooser::GetNextChosenFile() {
   if (file_queue_.empty())
     return 0;
@@ skipping 28 matching lines @@
 }
 
 PPB_FileChooser_Proxy::~PPB_FileChooser_Proxy() {
 }
 
 // static
 const InterfaceProxy::Info* PPB_FileChooser_Proxy::GetTrustedInfo() {
   static const Info info = {
     thunk::GetPPB_FileChooser_Trusted_Thunk(),
     PPB_FILECHOOSER_TRUSTED_INTERFACE,
-    INTERFACE_ID_NONE,  // FILE_CHOOSER is the canonical one.
+    API_ID_NONE,  // FILE_CHOOSER is the canonical one.
     false,
     &CreateFileChooserProxy
   };
   return &info;
 }
 
 // static
 PP_Resource PPB_FileChooser_Proxy::CreateProxyResource(
     PP_Instance instance,
     PP_FileChooserMode_Dev mode,
     const char* accept_mime_types) {
   Dispatcher* dispatcher = PluginDispatcher::GetForInstance(instance);
   if (!dispatcher)
     return 0;
 
   HostResource result;
   dispatcher->Send(new PpapiHostMsg_PPBFileChooser_Create(
-      INTERFACE_ID_PPB_FILE_CHOOSER, instance,
+      API_ID_PPB_FILE_CHOOSER, instance,
       mode,
       accept_mime_types ? accept_mime_types : "",
       &result));
 
   if (result.is_null())
     return 0;
   return (new FileChooser(result))->GetReference();
 }
 
 bool PPB_FileChooser_Proxy::OnMessageReceived(const IPC::Message& msg) {
@@ skipping 56 matching lines @@
   }
 }
 
 void PPB_FileChooser_Proxy::OnShowCallback(int32_t result,
                                            const HostResource& chooser) {
   EnterHostFromHostResource<PPB_FileChooser_API> enter(chooser);
 
   std::vector<PPB_FileRef_CreateInfo> files;
   if (enter.succeeded() && result == PP_OK) {
     PPB_FileRef_Proxy* file_ref_proxy = static_cast<PPB_FileRef_Proxy*>(
-        dispatcher()->GetInterfaceProxy(INTERFACE_ID_PPB_FILE_REF));
+        dispatcher()->GetInterfaceProxy(API_ID_PPB_FILE_REF));
 
     // Convert the returned files to the serialized info.
     while (PP_Resource cur_file_resource =
            enter.object()->GetNextChosenFile()) {
       PPB_FileRef_CreateInfo cur_create_info;
       file_ref_proxy->SerializeFileRef(cur_file_resource, &cur_create_info);
       files.push_back(cur_create_info);
     }
   }
 
   dispatcher()->Send(new PpapiMsg_PPBFileChooser_ChooseComplete(
-      INTERFACE_ID_PPB_FILE_CHOOSER, chooser, result, files));
+      API_ID_PPB_FILE_CHOOSER, chooser, result, files));
 }
 
 }  // namespace proxy
 }  // namespace ppapi