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

command_buffer/service/win/d3d9/sampler_d3d9.cc

 /*
  * 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 20 matching lines @@
 
 
 // This file contains the implementation of the SamplerD3D9 class.
 
 #include "command_buffer/service/win/d3d9/gapi_d3d9.h"
 #include "command_buffer/service/win/d3d9/sampler_d3d9.h"
 #include "command_buffer/service/win/d3d9/texture_d3d9.h"
 
 namespace o3d {
 namespace command_buffer {
+namespace o3d {
 
 namespace {
 
 // Converts an addressing mode to corresponding D3D values.
 D3DTEXTUREADDRESS AddressModeToD3D(sampler::AddressingMode mode) {
   switch (mode) {
     case sampler::kWrap:
       return D3DTADDRESS_WRAP;
     case sampler::kMirrorRepeat:
       return D3DTADDRESS_MIRROR;
@@ skipping 136 matching lines @@
     ResourceId texture_id) {
   SamplerD3D9 *sampler = samplers_.Get(id);
   if (!sampler)
     return parse_error::kParseInvalidArguments;
   // Dirty effect, because this sampler id may be used
   DirtyEffect();
   sampler->SetTexture(texture_id);
   return parse_error::kParseNoError;
 }
 
-
+}  // namespace o3d
 }  // namespace command_buffer
 }  // namespace o3d