Refactor/Rename a bunch of GPU stuff

gpu/command_buffer/service/context_state.cc

Index: gpu/command_buffer/service/context_state.cc
diff --git a/gpu/command_buffer/service/context_state.cc b/gpu/command_buffer/service/context_state.cc
index 152ac6eadbb2dae50619868566a5ea59e5059bb5..3b869e38a97f6b462d6de2c62380946c45804773 100644
--- a/gpu/command_buffer/service/context_state.cc
+++ b/gpu/command_buffer/service/context_state.cc
@@ -70,7 +70,7 @@ void ContextState::RestoreTextureUnitBindings(GLuint unit) const {
 
 void ContextState::RestoreBufferBindings() const {
   if (vertex_attrib_manager) {
-    BufferManager::BufferInfo* element_array_buffer =
+    BufferManager::Buffer* element_array_buffer =
         vertex_attrib_manager->element_array_buffer();
     glBindBuffer(GL_ELEMENT_ARRAY_BUFFER,
         element_array_buffer ? element_array_buffer->service_id() : 0);
@@ -96,10 +96,10 @@ void ContextState::RestoreActiveTexture() const {
 }
 
 void ContextState::RestoreAttribute(GLuint attrib) const {
-  const VertexAttribManager::VertexAttribInfo* info =
-      vertex_attrib_manager->GetVertexAttribInfo(attrib);
+  const VertexAttrib* info =
+      vertex_attrib_manager->GetVertexAttrib(attrib);
   const void* ptr = reinterpret_cast<const void*>(info->offset());
-  BufferManager::BufferInfo* buffer_info = info->buffer();
+  BufferManager::Buffer* buffer_info = info->buffer();
   glBindBuffer(
       GL_ARRAY_BUFFER, buffer_info ? buffer_info->service_id() : 0);
   glVertexAttribPointer(