Update gpu/ to use scoped_refptr<T>::get() rather than implicit "operator T*"

gpu/command_buffer/service/context_state.cc

 // 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.
 
 #include "gpu/command_buffer/service/context_state.h"
 
 #include "gpu/command_buffer/common/gles2_cmd_utils.h"
 #include "gpu/command_buffer/service/buffer_manager.h"
 #include "gpu/command_buffer/service/error_state.h"
 #include "gpu/command_buffer/service/framebuffer_manager.h"
@@ skipping 35 matching lines @@
   Initialize();
 }
 
 ContextState::~ContextState() {
 }
 
 void ContextState::RestoreTextureUnitBindings(GLuint unit) const {
   DCHECK_LT(unit, texture_units.size());
   const TextureUnit& texture_unit = texture_units[unit];
   glActiveTexture(GL_TEXTURE0 + unit);
-  GLuint service_id = texture_unit.bound_texture_2d ?
-      texture_unit.bound_texture_2d->service_id() : 0;
+  GLuint service_id = texture_unit.bound_texture_2d.get()
+                          ? texture_unit.bound_texture_2d->service_id()
+                          : 0;
   glBindTexture(GL_TEXTURE_2D, service_id);
-  service_id = texture_unit.bound_texture_cube_map ?
-      texture_unit.bound_texture_cube_map->service_id() : 0;
+  service_id = texture_unit.bound_texture_cube_map.get()
+                   ? texture_unit.bound_texture_cube_map->service_id()
+                   : 0;
   glBindTexture(GL_TEXTURE_CUBE_MAP, service_id);
 
   if (feature_info_->feature_flags().oes_egl_image_external) {
-    service_id = texture_unit.bound_texture_external_oes ?
-        texture_unit.bound_texture_external_oes->service_id() : 0;
+    service_id = texture_unit.bound_texture_external_oes.get()
+                     ? texture_unit.bound_texture_external_oes->service_id()
+                     : 0;
     glBindTexture(GL_TEXTURE_EXTERNAL_OES, service_id);
   }
 
   if (feature_info_->feature_flags().arb_texture_rectangle) {
-    service_id = texture_unit.bound_texture_rectangle_arb ?
-        texture_unit.bound_texture_rectangle_arb->service_id() : 0;
+    service_id = texture_unit.bound_texture_rectangle_arb.get()
+                     ? texture_unit.bound_texture_rectangle_arb->service_id()
+                     : 0;
     glBindTexture(GL_TEXTURE_RECTANGLE_ARB, service_id);
   }
 }
 
 void ContextState::RestoreBufferBindings() const {
-  if (vertex_attrib_manager) {
+  if (vertex_attrib_manager.get()) {
     Buffer* element_array_buffer =
         vertex_attrib_manager->element_array_buffer();
     glBindBuffer(GL_ELEMENT_ARRAY_BUFFER,
         element_array_buffer ? element_array_buffer->service_id() : 0);
   }
-  glBindBuffer(
-      GL_ARRAY_BUFFER,
-      bound_array_buffer ? bound_array_buffer->service_id() : 0);
+  glBindBuffer(GL_ARRAY_BUFFER,
+               bound_array_buffer.get() ? bound_array_buffer->service_id() : 0);
 }
 
 void ContextState::RestoreRenderbufferBindings() const {
   // Restore Bindings
   glBindRenderbufferEXT(
       GL_RENDERBUFFER,
-      bound_renderbuffer ? bound_renderbuffer->service_id() : 0);
+      bound_renderbuffer.get() ? bound_renderbuffer->service_id() : 0);
 }
 
 void ContextState::RestoreProgramBindings() const {
-  glUseProgram(current_program ? current_program->service_id() : 0);
+  glUseProgram(current_program.get() ? current_program->service_id() : 0);
 }
 
 void ContextState::RestoreActiveTexture() const {
   glActiveTexture(GL_TEXTURE0 + active_texture_unit);
 }
 
 void ContextState::RestoreAllTextureUnitBindings() const {
   // Restore Texture state.
   for (size_t ii = 0; ii < texture_units.size(); ++ii) {
     RestoreTextureUnitBindings(ii);
@@ skipping 33 matching lines @@
   glPixelStorei(GL_PACK_ALIGNMENT, pack_alignment);
   glPixelStorei(GL_UNPACK_ALIGNMENT, unpack_alignment);
 }
 
 void ContextState::RestoreState() const {
   RestoreAllTextureUnitBindings();
 
   // Restore Attrib State
   // TODO: This if should not be needed. RestoreState is getting called
   // before GLES2Decoder::Initialize which is a bug.
-  if (vertex_attrib_manager) {
+  if (vertex_attrib_manager.get()) {
     // TODO(gman): Move this restoration to VertexAttribManager.
     for (size_t attrib = 0; attrib < vertex_attrib_manager->num_attribs();
          ++attrib) {
       RestoreAttribute(attrib);
     }
   }
 
   RestoreBufferBindings();
   RestoreRenderbufferBindings();
   RestoreProgramBindings();
   RestoreGlobalState();
 }
 
 ErrorState* ContextState::GetErrorState() {
   return error_state_.get();
 }
 
 // Include the auto-generated part of this file. We split this because it means
 // we can easily edit the non-auto generated parts right here in this file
 // instead of having to edit some template or the code generator.
 #include "gpu/command_buffer/service/context_state_impl_autogen.h"
 
 }  // namespace gles2
 }  // namespace gpu