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

command_buffer/service/win/d3d9/geometry_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 26 matching lines @@
 #define O3D_COMMAND_BUFFER_SERVICE_WIN_D3D9_GEOMETRY_D3D9_H_
 
 #include <vector>
 #include <utility>
 #include "command_buffer/common/cross/gapi_interface.h"
 #include "command_buffer/service/win/d3d9/d3d9_utils.h"
 #include "command_buffer/service/cross/resource.h"
 
 namespace o3d {
 namespace command_buffer {
+namespace o3d {
 
 class GAPID3D9;
 
 // D3D9 version of VertexBuffer.
 class VertexBufferD3D9 : public VertexBuffer {
  public:
   VertexBufferD3D9(unsigned int size, unsigned int flags)
       : VertexBuffer(size, flags),
         d3d_vertex_buffer_(NULL) {}
   virtual ~VertexBufferD3D9();
@@ skipping 56 matching lines @@
   // Compiles the vertex declaration and stream map.
   void Compile(IDirect3DDevice9 *d3d_device);
 
   bool dirty_;
   typedef std::pair<ResourceId, unsigned int> StreamPair;
   std::vector<StreamPair> streams_;
   IDirect3DVertexDeclaration9 *d3d_vertex_decl_;
   DISALLOW_COPY_AND_ASSIGN(VertexStructD3D9);
 };
 
+}  // namespace o3d
 }  // namespace command_buffer
 }  // namespace o3d
 
 #endif  // O3D_COMMAND_BUFFER_SERVICE_WIN_D3D9_GEOMETRY_D3D9_H_