move all O3D specific command buffer stuff to command_buffer::o3d...

command_buffer/service/win/d3d9/gapi_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 28 matching lines @@
 #include "command_buffer/common/cross/gapi_interface.h"
 #include "command_buffer/service/win/d3d9/d3d9_utils.h"
 #include "command_buffer/service/win/d3d9/geometry_d3d9.h"
 #include "command_buffer/service/win/d3d9/effect_d3d9.h"
 #include "command_buffer/service/win/d3d9/texture_d3d9.h"
 #include "command_buffer/service/win/d3d9/sampler_d3d9.h"
 #include "command_buffer/service/win/d3d9/render_surface_d3d9.h"
 
 namespace o3d {
 namespace command_buffer {
+namespace o3d {
 
 // This class implements the GAPI interface for D3D9.
 class GAPID3D9 : public GAPIInterface {
  public:
   GAPID3D9();
   virtual ~GAPID3D9();
 
   void set_hwnd(HWND hwnd) { hwnd_ = hwnd; }
   HWND hwnd() const { return hwnd_; }
 
@@ skipping 435 matching lines @@
       LPD3DXBUFFER * compilation_errors);
   D3DXCreateEffectProc create_effect_;
 
   typedef HRESULT (WINAPI *D3DXGetShaderInputSemanticsProc)(
       const DWORD* function,
       D3DXSEMANTIC* semantics,
       UINT* count);
   D3DXGetShaderInputSemanticsProc get_shader_input_semantics_;
 };
 
+}  // namespace o3d
 }  // namespace command_buffer
 }  // namespace o3d
 
 #endif  // O3D_COMMAND_BUFFER_SERVICE_WIN_D3D9_GAPI_D3D9_H_