List sync points to wait on in AsyncFlush message

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 422168c009c05eab4fe90324fcff8db73d19b799..de72af2f67ba90aa97ba77fc645090db4b28e6b1 100644
--- a/gpu/command_buffer/service/gles2_cmd_decoder.cc
+++ b/gpu/command_buffer/service/gles2_cmd_decoder.cc
@@ -654,7 +654,6 @@ class GLES2DecoderImpl : public GLES2Decoder,
   const ContextState* GetContextState() override { return &state_; }
 
   void SetShaderCacheCallback(const ShaderCacheCallback& callback) override;
-  void SetWaitSyncPointCallback(const WaitSyncPointCallback& callback) override;
 
   AsyncPixelTransferManager* GetAsyncPixelTransferManager() override;
   void ResetAsyncPixelTransferManagerForTest() override;
@@ -1787,8 +1786,6 @@ class GLES2DecoderImpl : public GLES2Decoder,
 
   base::Callback<void(gfx::Size, float)> resize_callback_;
 
-  WaitSyncPointCallback wait_sync_point_callback_;
-
   ShaderCacheCallback shader_cache_callback_;
 
   scoped_ptr<AsyncPixelTransferManager> async_pixel_transfer_manager_;
@@ -3499,11 +3496,6 @@ void GLES2DecoderImpl::SetShaderCacheCallback(
   shader_cache_callback_ = callback;
 }
 
-void GLES2DecoderImpl::SetWaitSyncPointCallback(
-    const WaitSyncPointCallback& callback) {
-  wait_sync_point_callback_ = callback;
-}
-
 AsyncPixelTransferManager*
     GLES2DecoderImpl::GetAsyncPixelTransferManager() {
   return async_pixel_transfer_manager_.get();
@@ -9939,19 +9931,6 @@ error::Error GLES2DecoderImpl::HandleInsertSyncPointCHROMIUM(
   return error::kUnknownCommand;
 }
 
-error::Error GLES2DecoderImpl::HandleWaitSyncPointCHROMIUM(
-    uint32 immediate_data_size,
-    const void* cmd_data) {
-  const gles2::cmds::WaitSyncPointCHROMIUM& c =
-      *static_cast<const gles2::cmds::WaitSyncPointCHROMIUM*>(cmd_data);
-  uint32 sync_point = c.sync_point;
-  if (wait_sync_point_callback_.is_null())
-    return error::kNoError;
-
-  return wait_sync_point_callback_.Run(sync_point) ?
-      error::kNoError : error::kDeferCommandUntilLater;
-}
-
 error::Error GLES2DecoderImpl::HandleDiscardBackbufferCHROMIUM(
     uint32 immediate_data_size,
     const void* cmd_data) {
@@ -9993,6 +9972,7 @@ void GLES2DecoderImpl::DeleteQueriesEXTHelper(
 }
 
 bool GLES2DecoderImpl::ProcessPendingQueries(bool did_finish) {
+  MakeCurrent();
   if (query_manager_.get() == NULL) {
     return false;
   }