Refactor/Rename a bunch of GPU stuff

gpu/command_buffer/service/context_group.h

Index: gpu/command_buffer/service/context_group.h
diff --git a/gpu/command_buffer/service/context_group.h b/gpu/command_buffer/service/context_group.h
index 064e36f3fdeea25b46071f8d4c67723383bf3e76..8819179f4d996a16ebf84c003d98413041d18258 100644
--- a/gpu/command_buffer/service/context_group.h
+++ b/gpu/command_buffer/service/context_group.h
@@ -42,8 +42,6 @@ struct DisallowedFeatures;
 // resources.
 class GPU_EXPORT ContextGroup : public base::RefCounted<ContextGroup> {
  public:
-  typedef scoped_refptr<ContextGroup> Ref;
-
   ContextGroup(
       MailboxManager* mailbox_manager,
       ImageManager* image_manager,
@@ -195,7 +193,7 @@ class GPU_EXPORT ContextGroup : public base::RefCounted<ContextGroup> {
   linked_ptr<IdAllocatorInterface>
       id_namespaces_[id_namespaces::kNumIdNamespaces];
 
-  FeatureInfo::Ref feature_info_;
+  scoped_refptr<FeatureInfo> feature_info_;
 
   std::vector<base::WeakPtr<gles2::GLES2Decoder> > decoders_;