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

command_buffer/client/cross/cmd_buffer_helper_test.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 264 matching lines @@
   CommandBufferEntry args[2];
   args[0].value_uint32 = 3;
   args[1].value_float = 4.f;
 
   // Add a first command.
   AddCommandWithExpect(parse_error::kParseNoError, 3, 2, args);
   // keep track of the buffer position.
   CommandBufferOffset command1_put = get_helper_put();
   int32 token = helper_->InsertToken();
 
-  EXPECT_CALL(*api_mock_.get(), DoCommand(kSetToken, 1, _))
+  EXPECT_CALL(*api_mock_.get(), DoCommand(cmd::kSetToken, 1, _))
       .WillOnce(DoAll(Invoke(api_mock_.get(), &AsyncAPIMock::SetToken),
                       Return(parse_error::kParseNoError)));
   // Add another command.
   AddCommandWithExpect(parse_error::kParseNoError, 4, 2, args);
   helper_->WaitForToken(token);
   // check that the get pointer is beyond the first command.
   EXPECT_LE(command1_put, command_buffer_->GetGetOffset());
   helper_->Finish();
 
   // Check that the commands did happen.
   Mock::VerifyAndClearExpectations(api_mock_.get());
 
   // Check the error status.
   EXPECT_FALSE(command_buffer_->GetErrorStatus());
   EXPECT_EQ(parse_error::kParseNoError, command_buffer_->ResetParseError());
 }
 
 }  // namespace command_buffer
 }  // namespace o3d