Rename InterfaceID to ApiID and move the file.

ppapi/proxy/dispatcher.h

 // 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.
 
 #ifndef PPAPI_PROXY_DISPATCHER_H_
 #define PPAPI_PROXY_DISPATCHER_H_
 
 #include <set>
 #include <string>
 #include <vector>
 
 #include "base/callback.h"
 #include "base/tracked_objects.h"
 #include "ipc/ipc_channel_proxy.h"
 #include "ppapi/c/pp_instance.h"
 #include "ppapi/c/pp_module.h"
 #include "ppapi/proxy/callback_tracker.h"
 #include "ppapi/proxy/proxy_channel.h"
-#include "ppapi/proxy/interface_id.h"
 #include "ppapi/proxy/interface_list.h"
 #include "ppapi/proxy/interface_proxy.h"
 #include "ppapi/proxy/plugin_var_tracker.h"
+#include "ppapi/shared_impl/api_id.h"
 
 namespace ppapi {
 
 class WebKitForwarding;
 
 namespace proxy {
 
 class VarSerializationRules;
 
 // An interface proxy can represent either end of a cross-process interface
@@ skipping 21 matching lines @@
   // browser side.
   virtual bool IsPlugin() const = 0;
 
   VarSerializationRules* serialization_rules() const {
     return serialization_rules_.get();
   }
 
   // Returns a non-owning pointer to the interface proxy for the given ID, or
   // NULL if the ID isn't found. This will create the proxy if it hasn't been
   // created so far.
-  InterfaceProxy* GetInterfaceProxy(InterfaceID id);
+  InterfaceProxy* GetInterfaceProxy(ApiID id);
 
   // Returns the pointer to the IO thread for processing IPC messages.
   // TODO(brettw) remove this. It's a hack to support the Flash
   // ModuleLocalThreadAdapter. When the thread stuff is sorted out, this
   // implementation detail should be hidden.
   base::MessageLoopProxy* GetIPCMessageLoop();
 
   // Adds the given filter to the IO thread. Takes ownership of the pointer.
   // TODO(brettw) remove this. It's a hack to support the Flash
   // ModuleLocalThreadAdapter. When the thread stuff is sorted out, this
@@ skipping 28 matching lines @@
 
   bool disallow_trusted_interfaces() const {
     return disallow_trusted_interfaces_;
   }
 
  private:
   friend class HostDispatcherTest;
   friend class PluginDispatcherTest;
 
   // Lists all lazily-created interface proxies.
-  scoped_ptr<InterfaceProxy> proxies_[INTERFACE_ID_COUNT];
+  scoped_ptr<InterfaceProxy> proxies_[API_ID_COUNT];
 
   bool disallow_trusted_interfaces_;
 
   GetInterfaceFunc local_get_interface_;
 
   CallbackTracker callback_tracker_;
 
   scoped_ptr<VarSerializationRules> serialization_rules_;
 
   DISALLOW_COPY_AND_ASSIGN(Dispatcher);
 };
 
 }  // namespace proxy
 }  // namespace ppapi
 
 #endif  // PPAPI_PROXY_DISPATCHER_H_