Refactor/Rename a bunch of GPU stuff

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 "base/basictypes.h"
 #include "base/hash_tables.h"
@@ skipping 11 matching lines @@
 namespace gles2 {
 
 class FeatureInfo;
 
 // This class keeps track of the queries and their state
 // As Queries are not shared there is one QueryManager per context.
 class GPU_EXPORT QueryManager {
  public:
   class GPU_EXPORT Query : public base::RefCounted<Query> {
    public:
-    typedef scoped_refptr<Query> Ref;
-
     Query(
         QueryManager* manager, GLenum target, int32 shm_id, uint32 shm_offset);
 
     GLenum target() const {
       return target_;
     }
 
     bool IsDeleted() const {
       return deleted_;
     }
@@ skipping 168 matching lines @@
   GLES2Decoder* decoder_;
 
   bool use_arb_occlusion_query2_for_occlusion_query_boolean_;
   bool use_arb_occlusion_query_for_occlusion_query_boolean_;
 
   // Counts the number of Queries allocated with 'this' as their manager.
   // Allows checking no Query will outlive this.
   unsigned query_count_;
 
   // Info for each query in the system.
-  typedef base::hash_map<GLuint, Query::Ref> QueryMap;
+  typedef base::hash_map<GLuint, scoped_refptr<Query> > QueryMap;
   QueryMap queries_;
 
   // Queries waiting for completion.
-  typedef std::deque<Query::Ref> QueryQueue;
+  typedef std::deque<scoped_refptr<Query> > QueryQueue;
   QueryQueue pending_queries_;
 
   // 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_