Revert of Added SyncToken command buffer trait to help with IPC messages.

gpu/command_buffer/client/gles2_implementation.cc

Index: gpu/command_buffer/client/gles2_implementation.cc
diff --git a/gpu/command_buffer/client/gles2_implementation.cc b/gpu/command_buffer/client/gles2_implementation.cc
index bdeaef4df9195e284d41d2c127361d780462530a..27bdd8a0f99ce0b3943872020c292213cea53393 100644
--- a/gpu/command_buffer/client/gles2_implementation.cc
+++ b/gpu/command_buffer/client/gles2_implementation.cc
@@ -30,7 +30,6 @@
 #include "gpu/command_buffer/client/vertex_array_object_manager.h"
 #include "gpu/command_buffer/common/gles2_cmd_utils.h"
 #include "gpu/command_buffer/common/id_allocator.h"
-#include "gpu/command_buffer/common/sync_token.h"
 #include "gpu/command_buffer/common/trace_event.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/geometry/rect_f.h"
@@ -5389,9 +5388,9 @@
   SyncToken* sync_token_data = reinterpret_cast<SyncToken*>(sync_token);
   memset(sync_token_data, 0, sizeof(SyncToken));
 
-  sync_token_data->SetData(gpu_control_->GetNamespaceID(),
-                           gpu_control_->GetCommandBufferID(),
-                           fence_sync);
+  sync_token_data->namespace_id = gpu_control_->GetNamespaceID();
+  sync_token_data->command_buffer_id = gpu_control_->GetCommandBufferID();
+  sync_token_data->release_count = fence_sync;
 }
 
 void GLES2Implementation::WaitSyncTokenCHROMIUM(const GLbyte* sync_token) {
@@ -5402,9 +5401,9 @@
 
   const SyncToken* sync_token_data =
       reinterpret_cast<const SyncToken*>(sync_token);
-  helper_->WaitSyncTokenCHROMIUM(sync_token_data->GetNamespaceId(),
-                                 sync_token_data->GetCommandBufferId(),
-                                 sync_token_data->GetReleaseCount());
+  helper_->WaitSyncTokenCHROMIUM(sync_token_data->namespace_id,
+                                 sync_token_data->command_buffer_id,
+                                 sync_token_data->release_count);
 }
 
 namespace {