gpu: Reuse transfer buffers more aggresively

gpu/command_buffer/client/gles2_implementation_unittest.cc

Index: gpu/command_buffer/client/gles2_implementation_unittest.cc
diff --git a/gpu/command_buffer/client/gles2_implementation_unittest.cc b/gpu/command_buffer/client/gles2_implementation_unittest.cc
index dbb9b21bc24f84c2bfdd380b6b00e690469a1a9f..9e9d6c547f9bff84e27863e4360744ae2d373211 100644
--- a/gpu/command_buffer/client/gles2_implementation_unittest.cc
+++ b/gpu/command_buffer/client/gles2_implementation_unittest.cc
@@ -2681,7 +2681,11 @@ TEST_F(GLES2ImplementationTest, BeginEndQueryEXT) {
   QueryTracker::Query* query = GetQuery(id1);
   ASSERT_TRUE(query != NULL);
   expected_begin_cmds.begin_query.Init(
-      GL_ANY_SAMPLES_PASSED_EXT, id1, query->shm_id(), query->shm_offset());
+      GL_ANY_SAMPLES_PASSED_EXT,
+      id1,
+      query->internal(),
+      query->shm_id(),
+      query->shm_offset());
   EXPECT_EQ(0, memcmp(
       &expected_begin_cmds, commands, sizeof(expected_begin_cmds)));
   ClearCommands();
@@ -2711,7 +2715,7 @@ TEST_F(GLES2ImplementationTest, BeginEndQueryEXT) {
   };
   EndCmds expected_end_cmds;
   expected_end_cmds.end_query.Init(
-      GL_ANY_SAMPLES_PASSED_EXT, query->submit_count());
+      GL_ANY_SAMPLES_PASSED_EXT, query->internal(), query->submit_count());
   commands = GetPut();
   gl_->EndQueryEXT(GL_ANY_SAMPLES_PASSED_EXT);
   EXPECT_EQ(0, memcmp(
@@ -2728,7 +2732,7 @@ TEST_F(GLES2ImplementationTest, BeginEndQueryEXT) {
   gl_->BeginQueryEXT(GL_ANY_SAMPLES_PASSED_EXT, id1);
   EXPECT_NE(old_submit_count, query->submit_count());
   expected_end_cmds.end_query.Init(
-      GL_ANY_SAMPLES_PASSED_EXT, query->submit_count());
+      GL_ANY_SAMPLES_PASSED_EXT, query->internal(), query->submit_count());
   commands = GetPut();
   gl_->EndQueryEXT(GL_ANY_SAMPLES_PASSED_EXT);
   EXPECT_EQ(0, memcmp(
@@ -2780,9 +2784,13 @@ TEST_F(GLES2ImplementationTest, ErrorQuery) {
   };
   EndCmds expected_end_cmds;
   expected_end_cmds.begin_query.Init(
-      GL_GET_ERROR_QUERY_CHROMIUM, id, query->shm_id(), query->shm_offset());
+      GL_GET_ERROR_QUERY_CHROMIUM,
+      id,
+      query->internal(),
+      query->shm_id(),
+      query->shm_offset());
   expected_end_cmds.end_query.Init(
-      GL_GET_ERROR_QUERY_CHROMIUM, query->submit_count());
+      GL_GET_ERROR_QUERY_CHROMIUM, query->internal(), query->submit_count());
   const void* commands = GetPut();
   gl_->EndQueryEXT(GL_GET_ERROR_QUERY_CHROMIUM);
   EXPECT_EQ(0, memcmp(