Update from https://crrev.com/304121

gpu/command_buffer/service/query_manager.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef GPU_COMMAND_BUFFER_SERVICE_QUERY_MANAGER_H_
 #define GPU_COMMAND_BUFFER_SERVICE_QUERY_MANAGER_H_
 
 #include <deque>
 #include <vector>
 #include "base/atomicops.h"
@@ skipping 46 matching lines @@
       return shm_offset_;
     }
 
     // Returns false if shared memory for sync is invalid.
     virtual bool Begin() = 0;
 
     // Returns false if shared memory for sync is invalid.
     virtual bool End(base::subtle::Atomic32 submit_count) = 0;
 
     // Returns false if shared memory for sync is invalid.
-    virtual bool Process() = 0;
+    virtual bool Process(bool did_finish) = 0;
 
     virtual void Destroy(bool have_context) = 0;
 
     void AddCallback(base::Closure callback);
 
    protected:
     virtual ~Query();
 
     QueryManager* manager() const {
       return manager_;
@@ skipping 85 matching lines @@
   // Removes a query info for the given query.
   void RemoveQuery(GLuint client_id);
 
   // Returns false if any query is pointing to invalid shared memory.
   bool BeginQuery(Query* query);
 
   // Returns false if any query is pointing to invalid shared memory.
   bool EndQuery(Query* query, base::subtle::Atomic32 submit_count);
 
   // Processes pending queries. Returns false if any queries are pointing
-  // to invalid shared memory.
-  bool ProcessPendingQueries();
+  // to invalid shared memory. |did_finish| is true if this is called as
+  // a result of calling glFinish().
+  bool ProcessPendingQueries(bool did_finish);
 
   // True if there are pending queries.
   bool HavePendingQueries();
 
   // Processes pending transfer queries. Returns false if any queries are
   // pointing to invalid shared memory.
   bool ProcessPendingTransferQueries();
 
   // True if there are pending transfer queries.
   bool HavePendingTransferQueries();
@@ skipping 55 matching lines @@
   // Async pixel transfer queries waiting for completion.
   QueryQueue pending_transfer_queries_;
 
   DISALLOW_COPY_AND_ASSIGN(QueryManager);
 };
 
 }  // namespace gles2
 }  // namespace gpu
 
 #endif  // GPU_COMMAND_BUFFER_SERVICE_QUERY_MANAGER_H_