Change command buffer client code to use structures....

command_buffer/service/cross/mocks.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 34 matching lines @@
 #include "command_buffer/service/cross/cmd_buffer_engine.h"
 
 namespace o3d {
 namespace command_buffer {
 
 // Mocks an AsyncAPIInterface, using GMock.
 class AsyncAPIMock : public AsyncAPIInterface {
  public:
   AsyncAPIMock() {
     testing::DefaultValue<BufferSyncInterface::ParseError>::Set(
-        BufferSyncInterface::PARSE_NO_ERROR);
+        BufferSyncInterface::kParseNoError);
   }
 
   // Predicate that matches args passed to DoCommand, by looking at the values.
   class IsArgs {
    public:
     IsArgs(unsigned int arg_count, const void* args)
         : arg_count_(arg_count),
-          args_(static_cast<CommandBufferEntry*>(const_cast<void*>(args))) { }
+          args_(static_cast<CommandBufferEntry*>(const_cast<void*>(args))) {
+    }
 
     bool operator() (const void* _args) const {
       const CommandBufferEntry* args =
-          static_cast<const CommandBufferEntry*>(_args);
+          static_cast<const CommandBufferEntry*>(_args) + 1;
       for (unsigned int i = 0; i < arg_count_; ++i) {
         if (args[i].value_uint32 != args_[i].value_uint32) return false;
       }
       return true;
     }
 
    private:
     unsigned int arg_count_;
     CommandBufferEntry *args_;
   };
 
   MOCK_METHOD3(DoCommand, BufferSyncInterface::ParseError(
       unsigned int command,
       unsigned int arg_count,
-      const void* args));
+      const void* cmd_data));
 
-  // Sets the engine, to forward SET_TOKEN commands to it.
+  // Sets the engine, to forward SetToken commands to it.
   void set_engine(CommandBufferEngine *engine) { engine_ = engine; }
 
   // Forwards the SetToken commands to the engine.
   void SetToken(unsigned int command,
                 unsigned int arg_count,
                 const void* _args) {
     DCHECK(engine_);
     DCHECK_EQ(1, command);
     DCHECK_EQ(1, arg_count);
     const CommandBufferEntry* args =
@@ skipping 49 matching lines @@
  private:
   bool would_have_blocked_;
   unsigned int message_count_;
 };
 
 
 }  // namespace command_buffer
 }  // namespace o3d
 
 #endif  // O3D_COMMAND_BUFFER_SERVICE_CROSS_MOCKS_H_