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

command_buffer/service/win/d3d9/effect_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 25 matching lines @@
 #ifndef O3D_COMMAND_BUFFER_SERVICE_WIN_D3D9_EFFECT_D3D9_H_
 #define O3D_COMMAND_BUFFER_SERVICE_WIN_D3D9_EFFECT_D3D9_H_
 
 #include <vector>
 #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;
 class EffectD3D9;
 
 // ps_2_0 limit
 static const unsigned int kMaxSamplerUnits = 16;
 
 // D3D version of EffectParam. This class keeps a reference to the D3D effect.
 class EffectParamD3D9: public EffectParam {
  public:
@@ skipping 70 matching lines @@
   ID3DXConstantTable *fs_constant_table_;
   ParamList params_;
   StreamList streams_;
   bool sync_parameters_;
   ResourceId samplers_[kMaxSamplerUnits];
 
   friend class EffectParamD3D9;
   DISALLOW_COPY_AND_ASSIGN(EffectD3D9);
 };
 
+}  // namespace o3d
 }  // namespace command_buffer
 }  // namespace o3d
 
 #endif  // O3D_COMMAND_BUFFER_SERVICE_WIN_D3D9_EFFECT_D3D9_H_