Fix QueryCounter on a pending query

gpu/command_buffer/service/query_manager.cc

 // 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.
 
 #include "gpu/command_buffer/service/query_manager.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include "base/atomicops.h"
@@ skipping 1100 matching lines @@
   DCHECK(active_it != active_queries_.end());
   DCHECK(query == active_it->second.get());
   active_queries_.erase(active_it);
 
   return query->End(submit_count);
 }
 
 bool QueryManager::QueryCounter(
     Query* query, base::subtle::Atomic32 submit_count) {
   DCHECK(query);
+  if (!RemovePendingQuery(query)) {
+    return false;
+  }
   return query->QueryCounter(submit_count);
 }
 
 void QueryManager::PauseQueries() {
   for (std::pair<const GLenum, scoped_refptr<Query> >& it : active_queries_) {
     if (it.second->IsActive()) {
       it.second->Pause();
       DCHECK(it.second->IsPaused());
     }
   }
 }
 
 void QueryManager::ResumeQueries() {
   for (std::pair<const GLenum, scoped_refptr<Query> >& it : active_queries_) {
     if (it.second->IsPaused()) {
       it.second->Resume();
       DCHECK(it.second->IsActive());
     }
   }
 }
 
 }  // namespace gles2
 }  // namespace gpu