Revert 181883

gpu/command_buffer/service/query_manager.h

Index: gpu/command_buffer/service/query_manager.h
===================================================================
--- gpu/command_buffer/service/query_manager.h	(revision 182062)
+++ gpu/command_buffer/service/query_manager.h	(working copy)
@@ -89,21 +89,11 @@
       submit_count_ = submit_count;
     }
 
-    void UnmarkAsPending() {
-      DCHECK(pending_);
-      pending_ = false;
-    }
-
     // Returns false if shared memory for sync is invalid.
     bool AddToPendingQueue(uint32 submit_count) {
       return manager_->AddPendingQuery(this, submit_count);
     }
 
-    // Returns false if shared memory for sync is invalid.
-    bool AddToPendingTransferQueue(uint32 submit_count) {
-      return manager_->AddPendingTransferQuery(this, submit_count);
-    }
-
     void BeginQueryHelper(GLenum target, GLuint id) {
       manager_->BeginQueryHelper(target, id);
     }
@@ -112,15 +102,15 @@
       manager_->EndQueryHelper(target);
     }
 
-    uint32 submit_count() const {
-      return submit_count_;
-    }
-
    private:
     friend class QueryManager;
     friend class QueryManagerTest;
     friend class base::RefCounted<Query>;
 
+    uint32 submit_count() const {
+      return submit_count_;
+    }
+
     // The manager that owns this Query.
     QueryManager* manager_;
 
@@ -172,13 +162,6 @@
   // 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();
-
   GLES2Decoder* decoder() const {
     return decoder_;
   }
@@ -196,10 +179,6 @@
   // Returns false if any query is pointing to invalid shared memory.
   bool AddPendingQuery(Query* query, uint32 submit_count);
 
-  // Adds to queue of transfer queries waiting for completion.
-  // Returns false if any query is pointing to invalid shared memory.
-  bool AddPendingTransferQuery(Query* query, uint32 submit_count);
-
   // Removes a query from the queue of pending queries.
   // Returns false if any query is pointing to invalid shared memory.
   bool RemovePendingQuery(Query* query);
@@ -226,9 +205,6 @@
   typedef std::deque<Query::Ref> QueryQueue;
   QueryQueue pending_queries_;
 
-  // Async pixel transfer queries waiting for completion.
-  QueryQueue pending_transfer_queries_;
-
   DISALLOW_COPY_AND_ASSIGN(QueryManager);
 };