More work in Command Buffers...

command_buffer/service/win/d3d9/sampler_d3d9.h

 /*
  * Copyright 2009, Google Inc.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
@@ skipping 48 matching lines @@
                  sampler::AddressingMode addressing_w,
                  sampler::FilteringMode mag_filter,
                  sampler::FilteringMode min_filter,
                  sampler::FilteringMode mip_filter,
                  unsigned int max_anisotropy);
 
   // Sets the border color states.
   void SetBorderColor(const RGBA &color);
 
   // Sets the texture.
-  void SetTexture(ResourceID texture) { texture_id_ = texture; }
+  void SetTexture(ResourceId texture) { texture_id_ = texture; }
  private:
   D3DTEXTUREADDRESS d3d_address_u_;
   D3DTEXTUREADDRESS d3d_address_v_;
   D3DTEXTUREADDRESS d3d_address_w_;
   D3DTEXTUREFILTERTYPE d3d_mag_filter_;
   D3DTEXTUREFILTERTYPE d3d_min_filter_;
   D3DTEXTUREFILTERTYPE d3d_mip_filter_;
   DWORD d3d_max_anisotropy_;
   D3DCOLOR d3d_border_color_;
-  ResourceID texture_id_;
+  ResourceId texture_id_;
 };
 
 }  // namespace command_buffer
 }  // namespace o3d
 
 #endif  // O3D_COMMAND_BUFFER_SERVICE_WIN_D3D9_SAMPLER_D3D9_H_