Refactor/Rename a bunch of GPU stuff

gpu/command_buffer/service/query_manager.h

Index: gpu/command_buffer/service/query_manager.h
diff --git a/gpu/command_buffer/service/query_manager.h b/gpu/command_buffer/service/query_manager.h
index bf083aaa3633ce50c63bb658be6fb479a301960f..c13221fcba9cd3f837aa2184ee85026158d60cc0 100644
--- a/gpu/command_buffer/service/query_manager.h
+++ b/gpu/command_buffer/service/query_manager.h
@@ -29,8 +29,6 @@ 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);
 
@@ -219,11 +217,11 @@ class GPU_EXPORT QueryManager {
   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.