Rename InterfaceID to ApiID and move the file.

webkit/plugins/ppapi/host_globals.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 WEBKIT_PLUGINS_PPAPI_HOST_GLOBALS_H_
 #define WEBKIT_PLUGINS_PPAPI_HOST_GLOBALS_H_
 
 #include "base/compiler_specific.h"
 #include "ppapi/shared_impl/ppapi_globals.h"
 #include "ppapi/shared_impl/var_tracker.h"
@@ skipping 14 matching lines @@
   // Getter for the global singleton. Generally, you should use
   // PpapiGlobals::Get() when possible. Use this only when you need some
   // host-specific functionality.
   inline static HostGlobals* Get() { return host_globals_; }
 
   // PpapiGlobals implementation.
   virtual ::ppapi::ResourceTracker* GetResourceTracker() OVERRIDE;
   virtual ::ppapi::VarTracker* GetVarTracker() OVERRIDE;
   virtual ::ppapi::FunctionGroupBase* GetFunctionAPI(
       PP_Instance inst,
-      ::ppapi::proxy::InterfaceID id) OVERRIDE;
+      ::ppapi::ApiID id) OVERRIDE;
   virtual PP_Module GetModuleForInstance(PP_Instance instance) OVERRIDE;
 
   HostResourceTracker* host_resource_tracker() {
     return &host_resource_tracker_;
   }
   HostVarTracker* host_var_tracker() {
     return &host_var_tracker_;
   }
 
   // PP_Modules ----------------------------------------------------------------
@@ skipping 45 matching lines @@
   typedef std::map<PP_Module, PluginModule*> ModuleMap;
   ModuleMap module_map_;
 
   DISALLOW_COPY_AND_ASSIGN(HostGlobals);
 };
 
 }  // namespace ppapi
 }  // namespace webkit
 
 #endif   // WEBKIT_PLUGINS_PPAPI_HOST_GLOBALS_H_