Re-land: Mark async texture uploads as completed from the upload thread.

gpu/command_buffer/service/gles2_cmd_decoder.cc

Index: gpu/command_buffer/service/gles2_cmd_decoder.cc
diff --git a/gpu/command_buffer/service/gles2_cmd_decoder.cc b/gpu/command_buffer/service/gles2_cmd_decoder.cc
index 7f14ef2cedf391514bdce76e761ea380688d9c62..0f34765ccea556901ffae900a86e32368d384883 100644
--- a/gpu/command_buffer/service/gles2_cmd_decoder.cc
+++ b/gpu/command_buffer/service/gles2_cmd_decoder.cc
@@ -2725,6 +2725,9 @@ bool GLES2DecoderImpl::MakeCurrent() {
     return false;
   }
 
+  if (engine() && query_manager_.get())
+    query_manager_->ProcessPendingTransferQueries();
+
   // TODO(epenner): Is there a better place to do this? Transfers
   // can complete any time we yield the main thread. So we *must*
   // process transfers after any such yield, before resuming.
@@ -9126,6 +9129,8 @@ error::Error GLES2DecoderImpl::HandleEndQueryEXT(
     return error::kOutOfBounds;
   }
 
+  query_manager_->ProcessPendingTransferQueries();
+
   state_.current_query = NULL;
   return error::kNoError;
 }